Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/test.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/test.c (modified) (9 diffs)

branches/3.2/mindi-busybox/coreutils/test.c

@@ -40 +40 @@
 //config:     Enable 64-bit support in test.
 
+/* "test --help" does not print help (POSIX compat), only "[ --help" does.
+ * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION")
+ * Unfortunately, it screws up generated BusyBox.html. TODO. */
+//usage:#define test_trivial_usage
+//usage:       "EXPRESSION ]"
+//usage:#define test_full_usage "\n\n"
+//usage:       "Check file types, compare values etc. Return a 0/1 exit code\n"
+//usage:       "depending on logical value of EXPRESSION"
+//usage:
+//usage:#define test_example_usage
+//usage:       "$ test 1 -eq 2\n"
+//usage:       "$ echo $?\n"
+//usage:       "1\n"
+//usage:       "$ test 1 -eq 1\n"
+//usage:       "$ echo $?\n"
+//usage:       "0\n"
+//usage:       "$ [ -d /etc ]\n"
+//usage:       "$ echo $?\n"
+//usage:       "0\n"
+//usage:       "$ [ -d /junk ]\n"
+//usage:       "$ echo $?\n"
+//usage:       "1\n"
+
 #include "libbb.h"
 #include <setjmp.h>
@@ -46 +69 @@
 
 /* test_main() is called from shells, and we need to be extra careful here.
- * This is true regardless of PREFER_APPLETS and STANDALONE_SHELL
+ * This is true regardless of PREFER_APPLETS and SH_STANDALONE
  * state. */
 
@@ -588 +611 @@
 
         /* Root can execute any file that has any one of the execute
-           bits set. */
+         * bits set. */
         if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
             return 0;
@@ -688 +711 @@
             /* special case: [ ! ], [ a -a ! ] are valid */
             /* IOW, "! ARG" may miss ARG */
-            unnest_msg("<nexpr:1 (!EOI)\n");
+            args--;
+            unnest_msg("<nexpr:1 (!EOI), args:%s(%p)\n", args[0], &args[0]);
             return 1;
         }
@@ -707 +731 @@
     nest_msg(">aexpr(%s)\n", TOKSTR[n]);
     res = nexpr(n);
-    dbg_msg("aexpr: nexpr:%lld, next args:%s\n", res, args[1]);
+    dbg_msg("aexpr: nexpr:%lld, next args:%s(%p)\n", res, args[1], &args[1]);
     if (check_operator(*++args) == BAND) {
-        dbg_msg("aexpr: arg is AND, next args:%s\n", args[1]);
+        dbg_msg("aexpr: arg is AND, next args:%s(%p)\n", args[1], &args[1]);
         res = aexpr(check_operator(*++args)) && res;
         unnest_msg("<aexpr:%lld\n", res);
@@ -715 +739 @@
     }
     args--;
-    unnest_msg("<aexpr:%lld, args:%s\n", res, args[0]);
+    unnest_msg("<aexpr:%lld, args:%s(%p)\n", res, args[0], &args[0]);
     return res;
 }
@@ -726 +750 @@
     nest_msg(">oexpr(%s)\n", TOKSTR[n]);
     res = aexpr(n);
-    dbg_msg("oexpr: aexpr:%lld, next args:%s\n", res, args[1]);
+    dbg_msg("oexpr: aexpr:%lld, next args:%s(%p)\n", res, args[1], &args[1]);
     if (check_operator(*++args) == BOR) {
-        dbg_msg("oexpr: next arg is OR, next args:%s\n", args[1]);
+        dbg_msg("oexpr: next arg is OR, next args:%s(%p)\n", args[1], &args[1]);
         res = oexpr(check_operator(*++args)) || res;
         unnest_msg("<oexpr:%lld\n", res);
@@ -734 +758 @@
     }
     args--;
-    unnest_msg("<oexpr:%lld, args:%s\n", res, args[0]);
+    unnest_msg("<oexpr:%lld, args:%s(%p)\n", res, args[0], &args[0]);
     return res;
 }
@@ -879 +903 @@
 
     if (*args != NULL && *++args != NULL) {
-        /* TODO: example when this happens? */
+        /* Examples:
+         * test 3 -lt 5 6
+         * test -t 1 2
+         */
         bb_error_msg("%s: unknown operand", *args);
         res = 2;