-/* GNU test program (ksb and mjb) */
+/* test.c - GNU test program (ksb and mjb) */
/* Modified to run with the GNU shell Apr 25, 1988 by bfox. */
-/* Copyright (C) 1987, 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2010 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
- Bash is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 2, or (at your option) any later
- version.
+ Bash is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bash is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
+ Bash is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with Bash; see the file COPYING. If not, write to the Free Software
- Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with Bash. If not, see <http://www.gnu.org/licenses/>.
+*/
/* Define PATTERN_MATCHING to get the csh-like =~ and !~ pattern-matching
binary operators. */
#include "bashtypes.h"
-#if defined (HAVE_LIMITS_H)
-# include <limits.h>
-#else
+#if !defined (HAVE_LIMITS_H) && defined (HAVE_SYS_PARAM_H)
# include <sys/param.h>
#endif
# include <unistd.h>
#endif
-#if !defined (_POSIX_VERSION)
+#include <errno.h>
+#if !defined (errno)
+extern int errno;
+#endif /* !errno */
+
+#if !defined (_POSIX_VERSION) && defined (HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif /* !_POSIX_VERSION */
#include "posixstat.h"
#include "filecntl.h"
+#include "stat-time.h"
+
+#include "bashintl.h"
#include "shell.h"
+#include "pathexp.h"
+#include "test.h"
#include "builtins/common.h"
+#include <glob/strmatch.h>
+
#if !defined (STRLEN)
# define STRLEN(s) ((s)[0] ? ((s)[1] ? ((s)[2] ? strlen(s) : 2) : 1) : 0)
#endif
-#include <errno.h>
-#if !defined (errno)
-extern int errno;
-#endif /* !errno */
-
#if !defined (STREQ)
-# define STREQ(a, b) ((a)[0] == (b)[0] && strcmp (a, b) == 0)
+# define STREQ(a, b) ((a)[0] == (b)[0] && strcmp ((a), (b)) == 0)
#endif /* !STREQ */
-
-#if !defined (member)
-# define member(c, s) (int)((c) ? (char *)strchr ((s), (c)) : 0)
-#endif /* !member */
+#define STRCOLLEQ(a, b) ((a)[0] == (b)[0] && strcoll ((a), (b)) == 0)
#if !defined (R_OK)
#define R_OK 4
#define FALSE 0
#define SHELL_BOOLEAN(value) (!(value))
+#define TEST_ERREXIT_STATUS 2
+
static procenv_t test_exit_buf;
static int test_error_return;
#define test_exit(val) \
- do { test_error_return = val; longjmp (test_exit_buf, 1); } while (0)
+ do { test_error_return = val; sh_longjmp (test_exit_buf, 1); } while (0)
-#if defined (AFS)
- /* We have to use access(2) for machines running AFS, because it's
- not a Unix file system. This may produce incorrect answers for
- non-AFS files. I hate AFS. */
-# define EACCESS(path, mode) access(path, mode)
-#else
-# define EACCESS(path, mode) test_eaccess(path, mode)
-#endif /* AFS */
+extern int sh_stat __P((const char *, struct stat *));
static int pos; /* The offset of the current argument in ARGV. */
static int argc; /* The number of arguments present in ARGV. */
static char **argv; /* The argument list. */
static int noeval;
-static int unop ();
-static int binop ();
-static int unary_operator ();
-static int binary_operator ();
-static int two_arguments ();
-static int three_arguments ();
-static int posixtest ();
+static void test_syntax_error __P((char *, char *)) __attribute__((__noreturn__));
+static void beyond __P((void)) __attribute__((__noreturn__));
+static void integer_expected_error __P((char *)) __attribute__((__noreturn__));
+
+static int unary_operator __P((void));
+static int binary_operator __P((void));
+static int two_arguments __P((void));
+static int three_arguments __P((void));
+static int posixtest __P((void));
-static int expr ();
-static int term ();
-static int and ();
-static int or ();
+static int expr __P((void));
+static int term __P((void));
+static int and __P((void));
+static int or __P((void));
-static void beyond ();
+static int filecomp __P((char *, char *, int));
+static int arithcomp __P((char *, char *, int, int));
+static int patcomp __P((char *, char *, int));
static void
test_syntax_error (format, arg)
char *format, *arg;
{
- extern int interactive_shell;
- extern char *get_name_for_error ();
- if (interactive_shell == 0)
- fprintf (stderr, "%s: ", get_name_for_error ());
- fprintf (stderr, "%s: ", argv[0]);
- fprintf (stderr, format, arg);
- fprintf (stderr, "\n");
- fflush (stderr);
- test_exit (SHELL_BOOLEAN (FALSE));
+ builtin_error (format, arg);
+ test_exit (TEST_ERREXIT_STATUS);
}
-/* A wrapper for stat () which disallows pathnames that are empty strings
- and handles /dev/fd emulation on systems that don't have it. */
-static int
-test_stat (path, finfo)
- char *path;
- struct stat *finfo;
+/*
+ * beyond - call when we're beyond the end of the argument list (an
+ * error condition)
+ */
+static void
+beyond ()
{
- if (*path == '\0')
- {
- errno = ENOENT;
- return (-1);
- }
- if (path[0] == '/' && path[1] == 'd' && strncmp (path, "/dev/fd/", 8) == 0)
- {
-#if !defined (HAVE_DEV_FD)
- long fd;
- if (legal_number (path + 8, &fd))
- return (fstat ((int)fd, finfo));
- else
- {
- errno = EBADF;
- return (-1);
- }
-#else
- /* If HAVE_DEV_FD is defined, DEV_FD_PREFIX is defined also, and has a
- trailing slash. Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx.
- On most systems, with the notable exception of linux, this is
- effectively a no-op. */
- char pbuf[32];
- strcpy (pbuf, DEV_FD_PREFIX);
- strcat (pbuf, path + 8);
- return (stat (pbuf, finfo));
-#endif /* !HAVE_DEV_FD */
- }
- return (stat (path, finfo));
+ test_syntax_error (_("argument expected"), (char *)NULL);
}
-/* Do the same thing access(2) does, but use the effective uid and gid,
- and don't make the mistake of telling root that any file is
- executable. */
-static int
-test_eaccess (path, mode)
- char *path;
- int mode;
+/* Syntax error for when an integer argument was expected, but
+ something else was found. */
+static void
+integer_expected_error (pch)
+ char *pch;
{
- struct stat st;
-
- if (test_stat (path, &st) < 0)
- return (-1);
-
- if (current_user.euid == 0)
- {
- /* Root can read or write any file. */
- if (mode != X_OK)
- return (0);
-
- /* Root can execute any file that has any one of the execute
- bits set. */
- if (st.st_mode & S_IXUGO)
- return (0);
- }
-
- if (st.st_uid == current_user.euid) /* owner */
- mode <<= 6;
- else if (group_member (st.st_gid))
- mode <<= 3;
-
- if (st.st_mode & mode)
- return (0);
-
- return (-1);
+ test_syntax_error (_("%s: integer expression expected"), pch);
}
/* Increment our position in the argument list. Check that we're not
- past the end of the argument list. This check is supressed if the
+ past the end of the argument list. This check is suppressed if the
argument is FALSE. Made a macro for efficiency. */
#define advance(f) do { ++pos; if (f && pos >= argc) beyond (); } while (0)
#define unary_advance() do { advance (1); ++pos; } while (0)
/*
- * beyond - call when we're beyond the end of the argument list (an
- * error condition)
+ * expr:
+ * or
*/
-static void
-beyond ()
+static int
+expr ()
{
- test_syntax_error ("argument expected", (char *)NULL);
+ if (pos >= argc)
+ beyond ();
+
+ return (FALSE ^ or ()); /* Same with this. */
}
-/* Syntax error for when an integer argument was expected, but
- something else was found. */
-static void
-integer_expected_error (pch)
- char *pch;
+/*
+ * or:
+ * and
+ * and '-o' or
+ */
+static int
+or ()
+{
+ int value, v2;
+
+ value = and ();
+ if (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'o' && !argv[pos][2])
+ {
+ advance (0);
+ v2 = or ();
+ return (value || v2);
+ }
+
+ return (value);
+}
+
+/*
+ * and:
+ * term
+ * term '-a' and
+ */
+static int
+and ()
{
- test_syntax_error ("%s: integer expression expected", pch);
+ int value, v2;
+
+ value = term ();
+ if (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'a' && !argv[pos][2])
+ {
+ advance (0);
+ v2 = and ();
+ return (value && v2);
+ }
+ return (value);
}
/*
* evaluates to true or false, respectively.
*
* term ::=
- * '-'('a'|'b'|'c'|'d'|'e'|'f'|'g'|'h'|'p'|'r'|'s'|'u'|'w'|'x') filename
- * '-'('G'|'L'|'O'|'S') filename
+ * '-'('a'|'b'|'c'|'d'|'e'|'f'|'g'|'h'|'k'|'p'|'r'|'s'|'u'|'w'|'x') filename
+ * '-'('G'|'L'|'O'|'S'|'N') filename
* '-t' [int]
* '-'('z'|'n') string
+ * '-'('v'|'R') varname
+ * '-o' option
* string
* string ('!='|'='|'==') string
* <int> '-'(eq|ne|le|lt|ge|gt) <int>
}
/* A paren-bracketed argument. */
- if (argv[pos][0] == '(' && argv[pos][1] == '\0')
+ if (argv[pos][0] == '(' && argv[pos][1] == '\0') /* ) */
{
advance (1);
value = expr ();
- if (argv[pos] == 0)
- test_syntax_error ("`)' expected", (char *)NULL);
- else if (argv[pos][0] != ')' || argv[pos][1])
- test_syntax_error ("`)' expected, found %s", argv[pos]);
+ if (argv[pos] == 0) /* ( */
+ test_syntax_error (_("`)' expected"), (char *)NULL);
+ else if (argv[pos][0] != ')' || argv[pos][1]) /* ( */
+ test_syntax_error (_("`)' expected, found %s"), argv[pos]);
advance (0);
return (value);
}
-#if 1
/* are there enough arguments left that this could be dyadic? */
- if ((pos + 3 <= argc) && binop (argv[pos + 1]))
+ if ((pos + 3 <= argc) && test_binop (argv[pos + 1]))
value = binary_operator ();
-#else
- /* If this is supposed to be a binary operator, make sure there are
- enough arguments and fail if there are not. */
- if ((pos + 1 < argc) && binop (argv[pos+1]))
- {
- if (pos + 3 <= argc)
- value = binary_operator ();
- else
- beyond ();
- }
-#endif
/* Might be a switch type argument */
else if (argv[pos][0] == '-' && argv[pos][2] == '\0')
{
- if (unop (argv[pos][1]))
+ if (test_unop (argv[pos]))
value = unary_operator ();
else
- test_syntax_error ("%s: unary operator expected", argv[pos]);
+ test_syntax_error (_("%s: unary operator expected"), argv[pos]);
}
else
{
return (value);
}
+static int
+stat_mtime (fn, st, ts)
+ char *fn;
+ struct stat *st;
+ struct timespec *ts;
+{
+ int r;
+
+ r = sh_stat (fn, st);
+ if (r < 0)
+ return r;
+ *ts = get_stat_mtime (st);
+ return 0;
+}
+
static int
filecomp (s, t, op)
char *s, *t;
int op;
{
struct stat st1, st2;
+ struct timespec ts1, ts2;
+ int r1, r2;
- if (test_stat (s, &st1) < 0 || test_stat (t, &st2) < 0)
- return (FALSE);
+ if ((r1 = stat_mtime (s, &st1, &ts1)) < 0)
+ {
+ if (op == EF)
+ return (FALSE);
+ }
+ if ((r2 = stat_mtime (t, &st2, &ts2)) < 0)
+ {
+ if (op == EF)
+ return (FALSE);
+ }
+
switch (op)
{
- case OT: return (st1.st_mtime < st2.st_mtime);
- case NT: return (st1.st_mtime > st2.st_mtime);
- case EF: return ((st1.st_dev == st2.st_dev) && (st1.st_ino == st2.st_ino));
+ case OT: return (r1 < r2 || (r2 == 0 && timespec_cmp (ts1, ts2) < 0));
+ case NT: return (r1 > r2 || (r1 == 0 && timespec_cmp (ts1, ts2) > 0));
+ case EF: return (same_file (s, t, &st1, &st2));
}
return (FALSE);
}
static int
-arithcomp (s, t, op)
+arithcomp (s, t, op, flags)
char *s, *t;
- int op;
+ int op, flags;
{
- long l, r;
+ intmax_t l, r;
+ int expok;
+
+ if (flags & TEST_ARITHEXP)
+ {
+ l = evalexp (s, &expok);
+ if (expok == 0)
+ return (FALSE); /* should probably longjmp here */
+ r = evalexp (t, &expok);
+ if (expok == 0)
+ return (FALSE); /* ditto */
+ }
+ else
+ {
+ if (legal_number (s, &l) == 0)
+ integer_expected_error (s);
+ if (legal_number (t, &r) == 0)
+ integer_expected_error (t);
+ }
- if (legal_number (s, &l) == 0)
- integer_expected_error (s);
- if (legal_number (t, &r) == 0)
- integer_expected_error (t);
switch (op)
{
case EQ: return (l == r);
case LE: return (l <= r);
case GE: return (l >= r);
}
+
return (FALSE);
}
-#if defined (PATTERN_MATCHING)
static int
patcomp (string, pat, op)
char *string, *pat;
{
int m;
- m = fnmatch (pat, string, 0);
- switch (op)
+ m = strmatch (pat, string, FNMATCH_EXTFLAG|FNMATCH_IGNCASE);
+ return ((op == EQ) ? (m == 0) : (m != 0));
+}
+
+int
+binary_test (op, arg1, arg2, flags)
+ char *op, *arg1, *arg2;
+ int flags;
+{
+ int patmatch;
+
+ patmatch = (flags & TEST_PATMATCH);
+
+ if (op[0] == '=' && (op[1] == '\0' || (op[1] == '=' && op[2] == '\0')))
+ return (patmatch ? patcomp (arg1, arg2, EQ) : STREQ (arg1, arg2));
+ else if ((op[0] == '>' || op[0] == '<') && op[1] == '\0')
+ {
+#if defined (HAVE_STRCOLL)
+ if (shell_compatibility_level > 40 && flags & TEST_LOCALE)
+ return ((op[0] == '>') ? (strcoll (arg1, arg2) > 0) : (strcoll (arg1, arg2) < 0));
+ else
+#endif
+ return ((op[0] == '>') ? (strcmp (arg1, arg2) > 0) : (strcmp (arg1, arg2) < 0));
+ }
+ else if (op[0] == '!' && op[1] == '=' && op[2] == '\0')
+ return (patmatch ? patcomp (arg1, arg2, NE) : (STREQ (arg1, arg2) == 0));
+
+
+ else if (op[2] == 't')
{
- case EQ: return (m == 0);
- case NE: return (m != 0);
+ switch (op[1])
+ {
+ case 'n': return (filecomp (arg1, arg2, NT)); /* -nt */
+ case 'o': return (filecomp (arg1, arg2, OT)); /* -ot */
+ case 'l': return (arithcomp (arg1, arg2, LT, flags)); /* -lt */
+ case 'g': return (arithcomp (arg1, arg2, GT, flags)); /* -gt */
+ }
}
+ else if (op[1] == 'e')
+ {
+ switch (op[2])
+ {
+ case 'f': return (filecomp (arg1, arg2, EF)); /* -ef */
+ case 'q': return (arithcomp (arg1, arg2, EQ, flags)); /* -eq */
+ }
+ }
+ else if (op[2] == 'e')
+ {
+ switch (op[1])
+ {
+ case 'n': return (arithcomp (arg1, arg2, NE, flags)); /* -ne */
+ case 'g': return (arithcomp (arg1, arg2, GE, flags)); /* -ge */
+ case 'l': return (arithcomp (arg1, arg2, LE, flags)); /* -le */
+ }
+ }
+
+ return (FALSE); /* should never get here */
}
-#endif /* PATTERN_MATCHING */
+
static int
binary_operator ()
char *w;
w = argv[pos + 1];
- if (w[0] == '=' && (w[1] == '\0' || (w[1] == '=' && w[2] == '\0')))
- {
- value = STREQ (argv[pos], argv[pos + 2]);
- pos += 3;
- return (value);
- }
- if ((w[0] == '>' || w[0] == '<') && w[1] == '\0')
+ if ((w[0] == '=' && (w[1] == '\0' || (w[1] == '=' && w[2] == '\0'))) || /* =, == */
+ ((w[0] == '>' || w[0] == '<') && w[1] == '\0') || /* <, > */
+ (w[0] == '!' && w[1] == '=' && w[2] == '\0')) /* != */
{
- value = (w[0] == '>') ? strcmp (argv[pos], argv[pos + 2]) > 0
- : strcmp (argv[pos], argv[pos + 2]) < 0;
+ value = binary_test (w, argv[pos], argv[pos + 2], 0);
pos += 3;
return (value);
}
+
#if defined (PATTERN_MATCHING)
if ((w[0] == '=' || w[0] == '!') && w[1] == '~' && w[2] == '\0')
{
return (value);
}
#endif
- if (w[0] == '!' && w[1] == '=' && w[2] == '\0')
- {
- value = STREQ (argv[pos], argv[pos + 2]) == 0;
- pos += 3;
- return (value);
- }
- if (w[0] != '-' || w[3] != '\0')
+ if ((w[0] != '-' || w[3] != '\0') || test_binop (w) == 0)
{
- test_syntax_error ("%s: binary operator expected", w);
+ test_syntax_error (_("%s: binary operator expected"), w);
/* NOTREACHED */
return (FALSE);
}
- w++;
- if (w[1] == 't')
- {
- switch (w[0])
- {
- case 'n': value = filecomp (argv[pos], argv[pos + 2], NT); break;
- case 'o': value = filecomp (argv[pos], argv[pos + 2], OT); break;
- case 'l': value = arithcomp (argv[pos], argv[pos + 2], LT); break;
- case 'g': value = arithcomp (argv[pos], argv[pos + 2], GT); break;
- default: test_syntax_error ("-%s: binary operator expected", w);
- }
- }
- else if (w[0] == 'e')
- {
- switch (w[1])
- {
- case 'q': value = arithcomp (argv[pos], argv[pos + 2], EQ); break;
- case 'f': value = filecomp (argv[pos], argv[pos + 2], EF); break;
- default: test_syntax_error ("-%s: binary operator expected", w);
- }
- }
- else if (w[1] == 'e')
- {
- switch (w[0])
- {
- case 'n': value = arithcomp (argv[pos], argv[pos + 2], NE); break;
- case 'g': value = arithcomp (argv[pos], argv[pos + 2], GE); break;
- case 'l': value = arithcomp (argv[pos], argv[pos + 2], LE); break;
- default: test_syntax_error ("-%s: binary operator expected", w);
- }
- }
- else
- test_syntax_error ("-%s: binary operator expected", w);
-
+ value = binary_test (w, argv[pos], argv[pos + 2], 0);
pos += 3;
return value;
}
static int
unary_operator ()
{
- long r;
- struct stat stat_buf;
+ char *op;
+ intmax_t r;
+
+ op = argv[pos];
+ if (test_unop (op) == 0)
+ return (FALSE);
- switch (argv[pos][1])
+ /* the only tricky case is `-t', which may or may not take an argument. */
+ if (op[1] == 't')
{
- default:
- return (FALSE);
+ advance (0);
+ if (pos < argc)
+ {
+ if (legal_number (argv[pos], &r))
+ {
+ advance (0);
+ return (unary_test (op, argv[pos - 1]));
+ }
+ else
+ return (FALSE);
+ }
+ else
+ return (unary_test (op, "1"));
+ }
- /* All of the following unary operators use unary_advance (), which
- checks to make sure that there is an argument, and then advances
- pos right past it. This means that pos - 1 is the location of the
- argument. */
+ /* All of the unary operators take an argument, so we first call
+ unary_advance (), which checks to make sure that there is an
+ argument, and then advances pos right past it. This means that
+ pos - 1 is the location of the argument. */
+ unary_advance ();
+ return (unary_test (op, argv[pos - 1]));
+}
+int
+unary_test (op, arg)
+ char *op, *arg;
+{
+ intmax_t r;
+ struct stat stat_buf;
+ SHELL_VAR *v;
+
+ switch (op[1])
+ {
case 'a': /* file exists in the file system? */
case 'e':
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0);
+ return (sh_stat (arg, &stat_buf) == 0);
case 'r': /* file is readable? */
- unary_advance ();
- return (EACCESS (argv[pos - 1], R_OK) == 0);
+ return (sh_eaccess (arg, R_OK) == 0);
case 'w': /* File is writeable? */
- unary_advance ();
- return (EACCESS (argv[pos - 1], W_OK) == 0);
+ return (sh_eaccess (arg, W_OK) == 0);
case 'x': /* File is executable? */
- unary_advance ();
- return (EACCESS (argv[pos - 1], X_OK) == 0);
+ return (sh_eaccess (arg, X_OK) == 0);
case 'O': /* File is owned by you? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
+ return (sh_stat (arg, &stat_buf) == 0 &&
(uid_t) current_user.euid == (uid_t) stat_buf.st_uid);
case 'G': /* File is owned by your group? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
+ return (sh_stat (arg, &stat_buf) == 0 &&
(gid_t) current_user.egid == (gid_t) stat_buf.st_gid);
+ case 'N':
+ return (sh_stat (arg, &stat_buf) == 0 &&
+ stat_buf.st_atime <= stat_buf.st_mtime);
+
case 'f': /* File is a file? */
- unary_advance ();
- if (test_stat (argv[pos - 1], &stat_buf) < 0)
+ if (sh_stat (arg, &stat_buf) < 0)
return (FALSE);
/* -f is true if the given file exists and is a regular file. */
#endif /* !S_IFMT */
case 'd': /* File is a directory? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- (S_ISDIR (stat_buf.st_mode)));
+ return (sh_stat (arg, &stat_buf) == 0 && (S_ISDIR (stat_buf.st_mode)));
case 's': /* File has something in it? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- stat_buf.st_size > (off_t) 0);
+ return (sh_stat (arg, &stat_buf) == 0 && stat_buf.st_size > (off_t) 0);
case 'S': /* File is a socket? */
#if !defined (S_ISSOCK)
return (FALSE);
#else
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- S_ISSOCK (stat_buf.st_mode));
+ return (sh_stat (arg, &stat_buf) == 0 && S_ISSOCK (stat_buf.st_mode));
#endif /* S_ISSOCK */
case 'c': /* File is character special? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- S_ISCHR (stat_buf.st_mode));
+ return (sh_stat (arg, &stat_buf) == 0 && S_ISCHR (stat_buf.st_mode));
case 'b': /* File is block special? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- S_ISBLK (stat_buf.st_mode));
+ return (sh_stat (arg, &stat_buf) == 0 && S_ISBLK (stat_buf.st_mode));
case 'p': /* File is a named pipe? */
- unary_advance ();
#ifndef S_ISFIFO
return (FALSE);
#else
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- S_ISFIFO (stat_buf.st_mode));
+ return (sh_stat (arg, &stat_buf) == 0 && S_ISFIFO (stat_buf.st_mode));
#endif /* S_ISFIFO */
case 'L': /* Same as -h */
case 'h': /* File is a symbolic link? */
- unary_advance ();
#if !defined (S_ISLNK) || !defined (HAVE_LSTAT)
return (FALSE);
#else
- return ((argv[pos - 1][0] != '\0') &&
- (lstat (argv[pos - 1], &stat_buf) == 0) &&
- S_ISLNK (stat_buf.st_mode));
+ return ((arg[0] != '\0') &&
+ (lstat (arg, &stat_buf) == 0) && S_ISLNK (stat_buf.st_mode));
#endif /* S_IFLNK && HAVE_LSTAT */
case 'u': /* File is setuid? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- (stat_buf.st_mode & S_ISUID) != 0);
+ return (sh_stat (arg, &stat_buf) == 0 && (stat_buf.st_mode & S_ISUID) != 0);
case 'g': /* File is setgid? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- (stat_buf.st_mode & S_ISGID) != 0);
+ return (sh_stat (arg, &stat_buf) == 0 && (stat_buf.st_mode & S_ISGID) != 0);
case 'k': /* File has sticky bit set? */
- unary_advance ();
#if !defined (S_ISVTX)
/* This is not Posix, and is not defined on some Posix systems. */
return (FALSE);
#else
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- (stat_buf.st_mode & S_ISVTX) != 0);
+ return (sh_stat (arg, &stat_buf) == 0 && (stat_buf.st_mode & S_ISVTX) != 0);
#endif
- case 't': /* File fd is a terminal? fd defaults to stdout. */
- advance (0);
- if (pos < argc && legal_number (argv[pos], &r))
- {
- advance (0);
- return (isatty ((int)r));
- }
- return (isatty (1));
+ case 't': /* File fd is a terminal? */
+ if (legal_number (arg, &r) == 0)
+ return (FALSE);
+ return ((r == (int)r) && isatty ((int)r));
case 'n': /* True if arg has some length. */
- unary_advance ();
- return (argv[pos - 1][0] != '\0');
+ return (arg[0] != '\0');
case 'z': /* True if arg has no length. */
- unary_advance ();
- return (argv[pos - 1][0] == '\0');
-
- case 'o':
- unary_advance ();
- return (minus_o_option_value (argv[pos - 1]) == 1);
- }
-}
-
-/*
- * and:
- * term
- * term '-a' and
- */
-static int
-and ()
-{
- int value, v2;
+ return (arg[0] == '\0');
- value = term ();
- while (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'a' && !argv[pos][2])
- {
- advance (0);
- v2 = and ();
- return (value && v2);
- }
- return (value);
-}
+ case 'o': /* True if option `arg' is set. */
+ return (minus_o_option_value (arg) == 1);
-/*
- * or:
- * and
- * and '-o' or
- */
-static int
-or ()
-{
- int value, v2;
+ case 'v':
+ v = find_variable (arg);
+#if defined (ARRAY_VARS)
+ if (v == 0 && valid_array_reference (arg, 0))
+ {
+ char *t;
+ t = array_value (arg, 0, 0, (int *)0, (arrayind_t *)0);
+ return (t ? TRUE : FALSE);
+ }
+ else if (v && invisible_p (v) == 0 && array_p (v))
+ {
+ char *t;
+ /* [[ -v foo ]] == [[ -v foo[0] ]] */
+ t = array_reference (array_cell (v), 0);
+ return (t ? TRUE : FALSE);
+ }
+ else if (v && invisible_p (v) == 0 && assoc_p (v))
+ {
+ char *t;
+ t = assoc_reference (assoc_cell (v), "0");
+ return (t ? TRUE : FALSE);
+ }
+#endif
+ return (v && invisible_p (v) == 0 && var_isset (v) ? TRUE : FALSE);
- value = and ();
- while (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'o' && !argv[pos][2])
- {
- advance (0);
- v2 = or ();
- return (value || v2);
+ case 'R':
+ v = find_variable_noref (arg);
+ return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE);
}
- return (value);
-}
-
-/*
- * expr:
- * or
- */
-static int
-expr ()
-{
- if (pos >= argc)
- beyond ();
-
- return (FALSE ^ or ()); /* Same with this. */
+ /* We can't actually get here, but this shuts up gcc. */
+ return (FALSE);
}
-/* Return TRUE if S is one of the test command's binary operators. */
-static int
-binop (s)
- char *s;
+/* Return TRUE if OP is one of the test command's binary operators. */
+int
+test_binop (op)
+ char *op;
{
- char *t;
-
- if (s[0] == '=' && s[1] == '\0')
+ if (op[0] == '=' && op[1] == '\0')
return (1); /* '=' */
- else if ((s[0] == '<' || s[0] == '>') && s[1] == '\0') /* string <, > */
+ else if ((op[0] == '<' || op[0] == '>') && op[1] == '\0') /* string <, > */
return (1);
- else if ((s[0] == '=' || s[0] == '!') && s[1] == '=' && s[2] == '\0')
+ else if ((op[0] == '=' || op[0] == '!') && op[1] == '=' && op[2] == '\0')
return (1); /* `==' and `!=' */
#if defined (PATTERN_MATCHING)
- else if (s[2] == '\0' && s[1] == '~' && (s[0] == '=' || s[0] == '!'))
+ else if (op[2] == '\0' && op[1] == '~' && (op[0] == '=' || op[0] == '!'))
return (1);
#endif
- else if (s[0] != '-' || s[2] == '\0' || s[3] != '\0')
+ else if (op[0] != '-' || op[2] == '\0' || op[3] != '\0')
return (0);
else
{
- t = s + 1;
- if (t[1] == 't')
- switch (t[0])
+ if (op[2] == 't')
+ switch (op[1])
{
- case 'n': /* -nt */
- case 'o': /* -ot */
- case 'l': /* -lt */
- case 'g': /* -gt */
- return (1);
- default:
- return (0);
+ case 'n': /* -nt */
+ case 'o': /* -ot */
+ case 'l': /* -lt */
+ case 'g': /* -gt */
+ return (1);
+ default:
+ return (0);
}
- else if (t[0] == 'e')
- switch (t[1])
+ else if (op[1] == 'e')
+ switch (op[2])
{
- case 'q': /* -eq */
- case 'f': /* -ef */
- return (1);
- default:
- return (0);
+ case 'q': /* -eq */
+ case 'f': /* -ef */
+ return (1);
+ default:
+ return (0);
}
- else if (t[1] == 'e')
- switch (t[0])
+ else if (op[2] == 'e')
+ switch (op[1])
{
- case 'n': /* -ne */
- case 'l': /* -le */
- case 'g': /* -ge */
- return (1);
- default:
- return (0);
+ case 'n': /* -ne */
+ case 'g': /* -ge */
+ case 'l': /* -le */
+ return (1);
+ default:
+ return (0);
}
else
- return (0);
+ return (0);
}
}
/* Return non-zero if OP is one of the test command's unary operators. */
-static int
-unop (op)
- int op;
+int
+test_unop (op)
+ char *op;
{
- switch (op)
+ if (op[0] != '-' || op[2] != 0)
+ return (0);
+
+ switch (op[1])
{
case 'a': case 'b': case 'c': case 'd': case 'e':
case 'f': case 'g': case 'h': case 'k': case 'n':
- case 'p': case 'r': case 's': case 't': case 'u':
- case 'w': case 'x': case 'z':
- case 'G': case 'L': case 'O': case 'S':
- case 'o':
+ case 'o': case 'p': case 'r': case 's': case 't':
+ case 'u': case 'v': case 'w': case 'x': case 'z':
+ case 'G': case 'L': case 'O': case 'S': case 'N':
+ case 'R':
return (1);
}
+
return (0);
}
return (argv[pos + 1][0] == '\0');
else if (argv[pos][0] == '-' && argv[pos][2] == '\0')
{
- if (unop (argv[pos][1]))
+ if (test_unop (argv[pos]))
return (unary_operator ());
else
- test_syntax_error ("%s: unary operator expected", argv[pos]);
+ test_syntax_error (_("%s: unary operator expected"), argv[pos]);
}
else
- test_syntax_error ("%s: unary operator expected", argv[pos]);
+ test_syntax_error (_("%s: unary operator expected"), argv[pos]);
return (0);
}
#define ANDOR(s) (s[0] == '-' && !s[2] && (s[1] == 'a' || s[1] == 'o'))
+/* This could be augmented to handle `-t' as equivalent to `-t 1', but
+ POSIX requires that `-t' be given an argument. */
#define ONE_ARG_TEST(s) ((s)[0] != '\0')
static int
{
int value;
- if (binop (argv[pos+1]))
+ if (test_binop (argv[pos+1]))
{
value = binary_operator ();
pos = argc;
else if (ANDOR (argv[pos+1]))
{
if (argv[pos+1][1] == 'a')
- value = ONE_ARG_TEST(argv[pos]) && ONE_ARG_TEST(argv[pos+2]);
+ value = ONE_ARG_TEST(argv[pos]) && ONE_ARG_TEST(argv[pos+2]);
else
- value = ONE_ARG_TEST(argv[pos]) || ONE_ARG_TEST(argv[pos+2]);
+ value = ONE_ARG_TEST(argv[pos]) || ONE_ARG_TEST(argv[pos+2]);
pos = argc;
}
- else if (argv[pos][0] == '!' && !argv[pos][1])
+ else if (argv[pos][0] == '!' && argv[pos][1] == '\0')
{
advance (1);
value = !two_arguments ();
pos = argc;
}
else
- test_syntax_error ("%s: binary operator expected", argv[pos+1]);
+ test_syntax_error (_("%s: binary operator expected"), argv[pos+1]);
return (value);
}
value = !three_arguments ();
break;
}
+ else if (argv[pos][0] == '(' && argv[pos][1] == '\0' && argv[argc-1][0] == ')' && argv[argc-1][1] == '\0')
+ {
+ advance (1);
+ value = two_arguments ();
+ pos = argc;
+ break;
+ }
/* FALLTHROUGH */
default:
value = expr ();
char **margv;
{
int value;
-
int code;
- code = setjmp (test_exit_buf);
+ USE_VAR(margc);
+
+ code = setjmp_nosigs (test_exit_buf);
if (code)
return (test_error_return);
{
--margc;
+ if (margv[margc] && (margv[margc][0] != ']' || margv[margc][1]))
+ test_syntax_error (_("missing `]'"), (char *)NULL);
+
if (margc < 2)
test_exit (SHELL_BOOLEAN (FALSE));
-
- if (margv[margc] && (margv[margc][0] != ']' || margv[margc][1]))
- test_syntax_error ("missing `]'", (char *)NULL);
}
argc = margc;
value = posixtest ();
if (pos != argc)
- test_syntax_error ("too many arguments", (char *)NULL);
+ test_syntax_error (_("too many arguments"), (char *)NULL);
test_exit (SHELL_BOOLEAN (value));
}
projects / thirdparty / bash.git / blobdiff