Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/getopt32.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/libbb/getopt32.c (modified) (8 diffs)

branches/3.2/mindi-busybox/libbb/getopt32.c

@@ -8 +8 @@
  */
 
-#include <getopt.h>
+#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+# include <getopt.h>
+#endif
 #include "libbb.h"
 
@@ -81 +83 @@
 
         static const char applet_longopts[] ALIGN1 =
-        //"name\0" has_arg val
-        "verbose\0" No_argument "v"
-        ;
+                //"name\0" has_arg val
+                "verbose\0" No_argument "v"
+                ;
         applet_long_options = applet_longopts;
 
@@ -227 +229 @@
         opt_complementary = "b--cf:c--bf:f--bc".  If two of the
         mutually exclusive options are found, getopt32 will call
-    bb_show_usage() and die.
+        bb_show_usage() and die.
 
  "x--x" Variation of the above, it means that -x option should occur
@@ -466 +468 @@
         for (on_off = complementary; on_off->opt_char; on_off++)
             if (on_off->opt_char == *s)
-                break;
+                goto found_opt;
+        /* Without this, diagnostic of such bugs is not easy */
+        bb_error_msg_and_die("NO OPT %c!", *s);
+ found_opt:
         if (c == ':' && s[2] == ':') {
             on_off->param_type = PARAM_LIST;
@@ -473 +478 @@
         if (c == '+' && (s[2] == ':' || s[2] == '\0')) {
             on_off->param_type = PARAM_INT;
+            s++;
             continue;
         }
@@ -532 +538 @@
     /* In case getopt32 was already called:
      * reset the libc getopt() function, which keeps internal state.
-     * run_nofork_applet_prime() does this, but we might end up here
+     * run_nofork_applet() does this, but we might end up here
      * also via gunzip_main() -> gzip_main(). Play safe.
      */
@@ -542 +548 @@
 #endif
     /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
-
-    pargv = NULL;
 
     /* Note: just "getopt() <= 0" will not work well for
@@ -575 +579 @@
         if (on_off->counter)
             (*(on_off->counter))++;
-        if (on_off->param_type == PARAM_LIST) {
-            if (optarg)
+        if (optarg) {
+            if (on_off->param_type == PARAM_LIST) {
                 llist_add_to_end((llist_t **)(on_off->optarg), optarg);
-        } else if (on_off->param_type == PARAM_INT) {
-            if (optarg)
+            } else if (on_off->param_type == PARAM_INT) {
 //TODO: xatoi_positive indirectly pulls in printf machinery
                 *(unsigned*)(on_off->optarg) = xatoi_positive(optarg);
-        } else if (on_off->optarg) {
-            if (optarg)
+            } else if (on_off->optarg) {
                 *(char **)(on_off->optarg) = optarg;
-        }
-        if (pargv != NULL)
-            break;
+            }
+        }
     }