aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-07-17 00:59:26 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-07-17 00:59:26 +0200
commitd23f64eba79a702c36d8d8cec23b49c320897138 (patch)
treeb998ad8732c6ceec17dbaf59fe7bd0539b3f2f68 /coreutils
parentfff73641e473763ba47c84f5c04eb0fc0da6d64b (diff)
downloadbusybox-w32-d23f64eba79a702c36d8d8cec23b49c320897138.tar.gz
busybox-w32-d23f64eba79a702c36d8d8cec23b49c320897138.tar.bz2
busybox-w32-d23f64eba79a702c36d8d8cec23b49c320897138.zip
test: fix "test !" and "test abc -a !". closes bug 465
function old new delta nexpr 826 840 +14 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/test.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/coreutils/test.c b/coreutils/test.c
index 73048d311..c430f2210 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -627,7 +627,14 @@ static number_t nexpr(enum token n)
627 627
628 nest_msg(">nexpr(%s)\n", TOKSTR[n]); 628 nest_msg(">nexpr(%s)\n", TOKSTR[n]);
629 if (n == UNOT) { 629 if (n == UNOT) {
630 res = !nexpr(check_operator(*++args)); 630 n = check_operator(*++args);
631 if (n == EOI) {
632 /* special case: [ ! ], [ a -a ! ] are valid */
633 /* IOW, "! ARG" may miss ARG */
634 unnest_msg("<nexpr:1 (!EOI)\n");
635 return 1;
636 }
637 res = !nexpr(n);
631 unnest_msg("<nexpr:%lld\n", res); 638 unnest_msg("<nexpr:%lld\n", res);
632 return res; 639 return res;
633 } 640 }
@@ -798,7 +805,7 @@ int test_main(int argc, char **argv)
798 check_operator(argv[1]); 805 check_operator(argv[1]);
799 if (last_operator->op_type == BINOP) { 806 if (last_operator->op_type == BINOP) {
800 /* "test [!] arg1 <binary_op> arg2" */ 807 /* "test [!] arg1 <binary_op> arg2" */
801 args = &argv[0]; 808 args = argv;
802 res = (binop() == 0); 809 res = (binop() == 0);
803 goto ret; 810 goto ret;
804 } 811 }
@@ -811,7 +818,7 @@ int test_main(int argc, char **argv)
811 argv--; 818 argv--;
812 } 819 }
813#endif 820#endif
814 args = &argv[0]; 821 args = argv;
815 res = !oexpr(check_operator(*args)); 822 res = !oexpr(check_operator(*args));
816 823
817 if (*args != NULL && *++args != NULL) { 824 if (*args != NULL && *++args != NULL) {