Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/test.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/test.c (modified) (5 diffs)

branches/3.3/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"
+/* "test --help" is special-cased to ignore --help */
+//usage:#define test_trivial_usage NOUSAGE_STR
+//usage:#define test_full_usage ""
 //usage:
 //usage:#define test_example_usage
@@ -827 +822 @@
     int res;
     const char *arg0;
-//  bool negate = 0;
 
     arg0 = bb_basename(argv[0]);
@@ -845 +839 @@
         argv[argc] = NULL;
     }
+    /* argc is unused after this point */
 
     /* We must do DEINIT_S() prior to returning */
@@ -863 +858 @@
     /*ngroups = 0; - done by INIT_S() */
 
-    //argc--;
     argv++;
-
-    /* Implement special cases from POSIX.2, section 4.62.4 */
-    if (!argv[0]) { /* "test" */
-        res = 1;
-        goto ret;
-    }
-#if 0
-// Now it's fixed in the parser and should not be needed
-    if (LONE_CHAR(argv[0], '!') && argv[1]) {
-        negate = 1;
-        //argc--;
-        argv++;
-    }
-    if (!argv[1]) { /* "test [!] arg" */
-        res = (*argv[0] == '\0');
-        goto ret;
-    }
-    if (argv[2] && !argv[3]) {
-        check_operator(argv[1]);
-        if (last_operator->op_type == BINOP) {
-            /* "test [!] arg1 <binary_op> arg2" */
-            args = argv;
-            res = (binop() == 0);
-            goto ret;
+    args = argv;
+
+    /* Implement special cases from POSIX.2, section 4.62.4.
+     * Testcase: "test '(' = '('"
+     * The general parser would misinterpret '(' as group start.
+     */
+    if (1) {
+        int negate = 0;
+ again:
+        if (!argv[0]) {
+            /* "test" */
+            res = 1;
+            goto ret_special;
         }
-    }
-
-    /* Some complex expression. Undo '!' removal */
-    if (negate) {
-        negate = 0;
-        //argc++;
-        argv--;
-    }
-#endif
-    args = argv;
+        if (!argv[1]) {
+            /* "test [!] arg" */
+            res = (argv[0][0] == '\0');
+            goto ret_special;
+        }
+        if (argv[2] && !argv[3]) {
+            check_operator(argv[1]);
+            if (last_operator->op_type == BINOP) {
+                /* "test [!] arg1 <binary_op> arg2" */
+                args = argv;
+                res = (binop() == 0);
+ ret_special:
+                /* If there was leading "!" op... */
+                res ^= negate;
+                goto ret;
+            }
+        }
+        if (LONE_CHAR(argv[0], '!')) {
+            argv++;
+            negate ^= 1;
+            goto again;
+        }
+    }
+
     res = !oexpr(check_operator(*args));
 
@@ -912 +909 @@
  ret:
     DEINIT_S();
-//  return negate ? !res : res;
     return res;
 }