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. */
-
-/* Define STANDALONE to get the /bin/test version. Otherwise, you get
- the shell builtin version. */
-/* #define STANDALONE */
+ Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
/* Define PATTERN_MATCHING to get the csh-like =~ and !~ pattern-matching
binary operators. */
#include <stdio.h>
-#if defined (STANDALONE)
-# include <sys/types.h>
-#else
-# include "bashtypes.h"
-#endif
+#include "bashtypes.h"
#if defined (HAVE_LIMITS_H)
# include <limits.h>
# include <unistd.h>
#endif
+#include <errno.h>
+#if !defined (errno)
+extern int errno;
+#endif /* !errno */
+
#if !defined (_POSIX_VERSION)
# include <sys/file.h>
#endif /* !_POSIX_VERSION */
#include "posixstat.h"
#include "filecntl.h"
-#if !defined (STANDALONE)
-# include "shell.h"
-# include "builtins/common.h"
-# define main test_command
-# define isint legal_number
-# define getuid() current_user.uid
-# define geteuid() current_user.euid
-# define getgid() current_user.gid
-# define getegid() current_user.egid
-#else /* STANDALONE */
-# if !defined (S_IXUGO)
-# define S_IXUGO 0111
-# endif
-# if defined (HAVE_UNISTD_H)
-# include <unistd.h>
-# endif /* HAVE_UNISTD_H */
-# define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-# define digit(c) ((c) >= '0' && (c) <= '9')
-# define digit_value(c) ((c) - '0')
-#endif /* STANDALONE */
+#include "shell.h"
+#include "pathexp.h"
+#include "test.h"
+#include "builtins/common.h"
+
+#include <glob/fnmatch.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)
#endif /* !STREQ */
-#if !defined (member)
-# define member(c, s) (int)((c) ? (char *)strchr ((s), (c)) : 0)
-#endif /* !member */
-
-/* Make gid_t and uid_t mean something for non-posix systems. */
-#if defined (STANDALONE) && !defined (_POSIX_VERSION) && !defined (HAVE_UID_T)
-# if !defined (gid_t)
-# define gid_t int
-# endif
-# if !defined (uid_t)
-# define uid_t int
-# endif
-#endif /* STANDALONE && !_POSIX_VERSION && !HAVE_UID_T */
-
#if !defined (R_OK)
#define R_OK 4
#define W_OK 2
#define FALSE 0
#define SHELL_BOOLEAN(value) (!(value))
-#if defined (STANDALONE)
-# define test_exit(val) exit (val)
-#else
+#define TEST_ERREXIT_STATUS 2
+
static procenv_t test_exit_buf;
static int test_error_return;
-# define test_exit(val) \
+#define test_exit(val) \
do { test_error_return = val; longjmp (test_exit_buf, 1); } while (0)
-#endif /* STANDALONE */
+/* 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. */
#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)
static char **argv; /* The argument list. */
static int noeval;
-#if defined (STANDALONE)
-static int isint ();
-#endif
-static int unop ();
-static int binop ();
static int unary_operator ();
static int binary_operator ();
static int two_arguments ();
test_syntax_error (format, arg)
char *format, *arg;
{
-#if !defined (STANDALONE)
extern int interactive_shell;
extern char *get_name_for_error ();
if (interactive_shell == 0)
fprintf (stderr, "%s: ", get_name_for_error ());
-#endif
fprintf (stderr, "%s: ", argv[0]);
fprintf (stderr, format, arg);
fprintf (stderr, "\n");
fflush (stderr);
- test_exit (SHELL_BOOLEAN (FALSE));
+ test_exit (TEST_ERREXIT_STATUS);
+}
+
+/*
+ * beyond - call when we're beyond the end of the argument list (an
+ * error condition)
+ */
+static void
+beyond ()
+{
+ test_syntax_error ("argument expected", (char *)NULL);
+}
+
+/* Syntax error for when an integer argument was expected, but
+ something else was found. */
+static void
+integer_expected_error (pch)
+ char *pch;
+{
+ test_syntax_error ("%s: integer expression expected", pch);
}
/* A wrapper for stat () which disallows pathnames that are empty strings
{
#if !defined (HAVE_DEV_FD)
long fd;
- if (isint (path + 8, &fd))
+ if (legal_number (path + 8, &fd))
return (fstat ((int)fd, finfo));
else
{
return (stat (pbuf, finfo));
#endif /* !HAVE_DEV_FD */
}
+#if !defined (HAVE_DEV_STDIN)
+ else if (STREQN (path, "/dev/std", 8))
+ {
+ if (STREQ (path+8, "in"))
+ return (fstat (0, finfo));
+ else if (STREQ (path+8, "out"))
+ return (fstat (1, finfo));
+ else if (STREQ (path+8, "err"))
+ return (fstat (2, finfo));
+ else
+ return (stat (path, finfo));
+ }
+#endif /* !HAVE_DEV_STDIN */
return (stat (path, finfo));
}
/* 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
+int
test_eaccess (path, mode)
char *path;
int mode;
{
struct stat st;
- static int euid = -1;
if (test_stat (path, &st) < 0)
return (-1);
- if (euid == -1)
- euid = geteuid ();
-
- if (euid == 0)
+ if (current_user.euid == 0)
{
/* Root can read or write any file. */
if (mode != X_OK)
return (0);
}
- if (st.st_uid == euid) /* owner */
+ 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);
+ errno = EACCES;
return (-1);
}
-#if defined (HAVE_GETGROUPS)
-/* The number of groups that this user is a member of. */
-static int ngroups, maxgroups;
-static GETGROUPS_T *group_array = (GETGROUPS_T *)NULL;
-#endif /* HAVE_GETGROUPS */
-
-#if !defined (NOGROUP)
-# define NOGROUP (gid_t) -1
-#endif
-
-#if defined (HAVE_GETGROUPS)
-
-# if defined (NGROUPS_MAX)
-# define getmaxgroups() NGROUPS_MAX
-# else /* !NGROUPS_MAX */
-# if defined (NGROUPS)
-# define getmaxgroups() NGROUPS
-# else /* !NGROUPS */
-# define getmaxgroups() 64
-# endif /* !NGROUPS */
-# endif /* !NGROUPS_MAX */
-
-#endif /* HAVE_GETGROUPS */
-
-/* Return non-zero if GID is one that we have in our groups list. */
-int
-group_member (gid)
- gid_t gid;
-{
- static gid_t pgid = (gid_t)NOGROUP;
- static gid_t egid = (gid_t)NOGROUP;
-#if defined (HAVE_GETGROUPS)
- register int i;
-#endif
-
- if (pgid == (gid_t)NOGROUP)
- pgid = (gid_t) getgid ();
-
- if (egid == (gid_t)NOGROUP)
- egid = (gid_t) getegid ();
-
- if (gid == pgid || gid == egid)
- return (1);
-
-#if defined (HAVE_GETGROUPS)
- /* getgroups () returns the number of elements that it was able to
- place into the array. */
- if (ngroups == 0)
- {
- if (maxgroups == 0)
- maxgroups = getmaxgroups ();
- group_array = (GETGROUPS_T *)xrealloc (group_array, maxgroups * sizeof (GETGROUPS_T));
- ngroups = getgroups (maxgroups, group_array);
- }
-
- /* In case of error, the user loses. */
- if (ngroups <= 0)
- return (0);
-
- /* Search through the list looking for GID. */
- for (i = 0; i < ngroups; i++)
- if (gid == (gid_t)group_array[i])
- return (1);
-#endif /* HAVE_GETGROUPS */
-
- return (0);
-}
-
/* 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
argument is FALSE. Made a macro for efficiency. */
#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 ();
-/* Syntax error for when an integer argument was expected, but
- something else was found. */
-static void
-integer_expected_error (pch)
- char *pch;
-{
- test_syntax_error ("%s: integer expression expected", pch);
+ return (FALSE ^ or ()); /* Same with this. */
}
-#if defined (STANDALONE)
-/* Return non-zero if the characters pointed to by STRING constitute a
- valid number. Stuff the converted number into RESULT if RESULT is
- a non-null pointer to a long. */
+/*
+ * or:
+ * and
+ * and '-o' or
+ */
static int
-isint (string, result)
- register char *string;
- long *result;
+or ()
{
- int sign;
- long value;
-
- sign = 1;
- value = 0;
-
- if (result)
- *result = 0;
-
- /* Skip leading whitespace characters. */
- while (whitespace (*string))
- string++;
-
- if (!*string)
- return (0);
-
- /* We allow leading `-' or `+'. */
- if (*string == '-' || *string == '+')
- {
- if (!digit (string[1]))
- return (0);
-
- if (*string == '-')
- sign = -1;
-
- string++;
- }
+ int value, v2;
- while (digit (*string))
+ value = and ();
+ while (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'o' && !argv[pos][2])
{
- if (result)
- value = (value * 10) + digit_value (*string);
- string++;
+ advance (0);
+ v2 = or ();
+ return (value || v2);
}
- /* Skip trailing whitespace, if any. */
- while (whitespace (*string))
- string++;
+ return (value);
+}
- /* Error if not at end of string. */
- if (*string)
- return (0);
+/*
+ * and:
+ * term
+ * term '-a' and
+ */
+static int
+and ()
+{
+ int value, v2;
- if (result)
+ value = term ();
+ while (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'a' && !argv[pos][2])
{
- value *= sign;
- *result = value;
+ advance (0);
+ v2 = and ();
+ return (value && v2);
}
-
- return (1);
+ return (value);
}
-#endif /* STANDALONE */
/*
* term - parse a term and return 1 or 0 depending on whether the term
* 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
+ * '-o' option
* string
* string ('!='|'='|'==') string
* <int> '-'(eq|ne|le|lt|ge|gt) <int>
advance (1);
value = expr ();
if (argv[pos] == 0)
- test_syntax_error ("`)' expected", (char *)NULL);
+ test_syntax_error ("`)' expected", (char *)NULL);
else if (argv[pos][0] != ')' || argv[pos][1])
test_syntax_error ("`)' expected, found %s", argv[pos]);
advance (0);
}
/* 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 ();
/* 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]);
{
struct stat st1, st2;
- if (test_stat (s, &st1) < 0 || test_stat (t, &st2) < 0)
- return (FALSE);
+ if (test_stat (s, &st1) < 0)
+ {
+ st1.st_mtime = 0;
+ if (op == EF)
+ return (FALSE);
+ }
+ if (test_stat (t, &st2) < 0)
+ {
+ st2.st_mtime = 0;
+ if (op == EF)
+ return (FALSE);
+ }
+
switch (op)
{
case OT: return (st1.st_mtime < st2.st_mtime);
}
static int
-arithcomp (s, t, op)
+arithcomp (s, t, op, flags)
char *s, *t;
- int op;
+ int op, flags;
{
long 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 (isint (s, &l) == 0)
- integer_expected_error (s);
- if (isint (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 = fnmatch (pat, string, FNMATCH_EXTFLAG);
+ 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')
+ 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')
+ {
+ 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')
{
- case EQ: return (m == 0);
- case NE: return (m != 0);
+ 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')))
+ 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 = STREQ (argv[pos], argv[pos + 2]);
- pos += 3;
- return (value);
- }
- if ((w[0] == '>' || w[0] == '<') && w[1] == '\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);
/* 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 ()
{
+ char *op, *arg;
long r;
- struct stat stat_buf;
- switch (argv[pos][1])
+ op = argv[pos];
+ if (test_unop (op) == 0)
+ return (FALSE);
+
+ /* 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;
+{
+ long r;
+ struct stat stat_buf;
+
+ 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 (test_stat (arg, &stat_buf) == 0);
case 'r': /* file is readable? */
- unary_advance ();
- return (EACCESS (argv[pos - 1], R_OK) == 0);
+ return (EACCESS (arg, R_OK) == 0);
case 'w': /* File is writeable? */
- unary_advance ();
- return (EACCESS (argv[pos - 1], W_OK) == 0);
+ return (EACCESS (arg, W_OK) == 0);
case 'x': /* File is executable? */
- unary_advance ();
- return (EACCESS (argv[pos - 1], X_OK) == 0);
+ return (EACCESS (arg, X_OK) == 0);
case 'O': /* File is owned by you? */
- unary_advance ();
- return (test_stat (argv[pos - 1], &stat_buf) == 0 &&
- (uid_t) geteuid () == (uid_t) stat_buf.st_uid);
+ return (test_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 &&
- (gid_t) getegid () == (gid_t) stat_buf.st_gid);
+ return (test_stat (arg, &stat_buf) == 0 &&
+ (gid_t) current_user.egid == (gid_t) stat_buf.st_gid);
+
+ case 'N':
+ return (test_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 (test_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 (test_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 (test_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 (test_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 (test_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 (test_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 (test_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 (test_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 (test_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 (test_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 && isint (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 (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');
-
-#if !defined (STANDALONE)
- case 'o':
- unary_advance ();
- return (minus_o_option_value (argv[pos - 1]) == 1);
-#endif /* !STANDALONE */
- }
-}
-
-/*
- * 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);
-}
-
-/*
- * or:
- * and
- * and '-o' or
- */
-static int
-or ()
-{
- int value, v2;
-
- value = and ();
- while (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'o' && !argv[pos][2])
- {
- advance (0);
- v2 = or ();
- return (value || v2);
+ case 'o': /* True if option `arg' is set. */
+ return (minus_o_option_value (arg) == 1);
}
-
- return (value);
-}
-
-/*
- * expr:
- * or
- */
-static int
-expr ()
-{
- if (pos >= argc)
- beyond ();
-
- return (FALSE ^ or ()); /* Same with this. */
}
-/* 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[1] == '\0' && (s[0] == '<' || s[0] == '>')) /* string <, > */
+ else if ((op[0] == '<' || op[0] == '>') && op[1] == '\0') /* string <, > */
return (1);
- else if (s[2] == '\0' && s[1] == '=' && (s[0] == '=' || s[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] != '-')
+ 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':
-#if !defined (STANDALONE)
- case 'o':
-#endif
+ case 'o': 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 'N':
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]);
{
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 ();
* test expr
*/
int
-main (margc, margv)
+test_command (margc, margv)
int margc;
char **margv;
{
int value;
-#if !defined (STANDALONE)
int code;
code = setjmp (test_exit_buf);
if (code)
return (test_error_return);
-#endif /* !STANDALONE */
argv = margv;
{
--margc;
- if (margc < 2)
- test_exit (SHELL_BOOLEAN (FALSE));
-
if (margv[margc] && (margv[margc][0] != ']' || margv[margc][1]))
test_syntax_error ("missing `]'", (char *)NULL);
+
+ if (margc < 2)
+ test_exit (SHELL_BOOLEAN (FALSE));
}
argc = margc;
projects / platform / upstream / bash.git / blobdiff