diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2001-11-19 20:39:24 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2001-11-19 20:39:24 +0000 |
| commit | bd90b9c76eaee4d550b8713ea0a23492a6181dee (patch) | |
| tree | 364a021b40390f4e356b5e65bc490fe5b4119b2d | |
| parent | 6fba85a0cf3ca18355146a3792b61e038d152629 (diff) | |
Notes
| -rw-r--r-- | bin/test/test.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/bin/test/test.c b/bin/test/test.c index 8007a47af791..1637c0d2bcb2 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -204,18 +204,19 @@ main(argc, argv) else p++; if (strcmp(p, "[") == 0) { - if (strcmp(argv[--argc], "]")) + if (strcmp(argv[--argc], "]") != 0) error("missing ]"); argv[argc] = NULL; } + /* no expression => false */ + if (--argc <= 0) + return 1; + /* XXX work around the absence of an eaccess(2) syscall */ (void)setgid(getegid()); (void)setuid(geteuid()); - if (--argc <= 0) - return 1; - t_wp = &argv[1]; res = !oexpr(t_lex(*t_wp)); @@ -469,13 +470,13 @@ getn(s) r = strtol(s, &p, 10); if (errno != 0) - error("%s: out of range", s); + error("%s: out of range", s); while (isspace((unsigned char)*p)) - p++; + p++; if (*p) - error("%s: bad number", s); + error("%s: bad number", s); return (int) r; } @@ -492,13 +493,13 @@ getq(s) r = strtoq(s, &p, 10); if (errno != 0) - error("%s: out of range", s); + error("%s: out of range", s); while (isspace((unsigned char)*p)) - p++; + p++; if (*p) - error("%s: bad number", s); + error("%s: bad number", s); return r; } |
