Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/getopt.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/util-linux/getopt.c (modified) (7 diffs)

branches/3.3/mindi-busybox/util-linux/getopt.c

@@ -36 +36 @@
 //usage:#define getopt_full_usage "\n\n"
 //usage:    IF_LONG_OPTS(
-//usage:       "    -a,--alternative        Allow long options starting with single -"
-//usage:     "\n    -l,--longoptions=LOPT[,...] Long options to be recognized"
-//usage:     "\n    -n,--name=PROGNAME      The name under which errors are reported"
-//usage:     "\n    -o,--options=OPTSTRING      Short options to be recognized"
-//usage:     "\n    -q,--quiet          Disable error reporting by getopt(3)"
+//usage:    IF_FEATURE_GETOPT_LONG(
+//usage:       "    -a,--alternative        Allow long options starting with single -\n"
+//usage:       "    -l,--longoptions=LOPT[,...] Long options to recognize\n"
+//usage:    )
+//usage:       "    -n,--name=PROGNAME      The name under which errors are reported"
+//usage:     "\n    -o,--options=OPTSTRING      Short options to recognize"
+//usage:     "\n    -q,--quiet          No error messages on unrecognized options"
 //usage:     "\n    -Q,--quiet-output       No normal output"
 //usage:     "\n    -s,--shell=SHELL        Set shell quoting conventions"
-//usage:     "\n    -T,--test           Test for getopt(1) version"
-//usage:     "\n    -u,--unquoted           Don't quote the output"
+//usage:     "\n    -T,--test           Version test (exits with 4)"
+//usage:     "\n    -u,--unquoted           Don't quote output"
 //usage:    )
 //usage:    IF_NOT_LONG_OPTS(
-//usage:       "    -a      Allow long options starting with single -"
-//usage:     "\n    -l LOPT[,...]   Long options to be recognized"
-//usage:     "\n    -n PROGNAME The name under which errors are reported"
-//usage:     "\n    -o OPTSTRING    Short options to be recognized"
-//usage:     "\n    -q      Disable error reporting by getopt(3)"
+//usage:    IF_FEATURE_GETOPT_LONG(
+//usage:       "    -a      Allow long options starting with single -\n"
+//usage:       "    -l LOPT[,...]   Long options to recognize\n"
+//usage:    )
+//usage:       "    -n PROGNAME The name under which errors are reported"
+//usage:     "\n    -o OPTSTRING    Short options to recognize"
+//usage:     "\n    -q      No error messages on unrecognized options"
 //usage:     "\n    -Q      No normal output"
 //usage:     "\n    -s SHELL    Set shell quoting conventions"
-//usage:     "\n    -T      Test for getopt(1) version"
-//usage:     "\n    -u      Don't quote the output"
+//usage:     "\n    -T      Version test (exits with 4)"
+//usage:     "\n    -u      Don't quote output"
 //usage:    )
+//usage:    IF_FEATURE_GETOPT_LONG( /* example uses -l, needs FEATURE_GETOPT_LONG */
 //usage:     "\n"
 //usage:     "\nExample:"
@@ -74 +79 @@
 //usage:     "\n    esac"
 //usage:     "\ndone"
+//usage:    )
 //usage:
 //usage:#define getopt_example_usage
@@ -215 +221 @@
 {
     int exit_code = 0; /* We assume everything will be OK */
-    int opt;
-#if ENABLE_FEATURE_GETOPT_LONG
-    int longindex;
-#endif
-    const char *charptr;
 
     if (quiet_errors) /* No error reporting from getopt(3) */
@@ -234 +235 @@
 
     while (1) {
-        opt =
-#if ENABLE_FEATURE_GETOPT_LONG
-            alternative ?
-            getopt_long_only(argc, argv, optstr, longopts, &longindex) :
-            getopt_long(argc, argv, optstr, longopts, &longindex);
+#if ENABLE_FEATURE_GETOPT_LONG
+        int longindex;
+        int opt = alternative
+            ? getopt_long_only(argc, argv, optstr, longopts, &longindex)
+            : getopt_long(argc, argv, optstr, longopts, &longindex)
+        ;
 #else
-            getopt(argc, argv, optstr);
+        int opt = getopt(argc, argv, optstr);
 #endif
         if (opt == -1)
@@ -258 +260 @@
                 printf(" %s", normalize(optarg));
             else {
+                const char *charptr;
                 printf(" -%c", opt);
                 charptr = strchr(optstr, opt);
-                if (charptr != NULL && *++charptr == ':')
+                if (charptr && *++charptr == ':')
                     printf(" %s",
                         normalize(optarg ? optarg : ""));
@@ -268 +271 @@
 
     if (!quiet_output) {
+        unsigned idx;
         printf(" --");
-        while (optind < argc)
-            printf(" %s", normalize(argv[optind++]));
+        idx = optind;
+        while (argv[idx])
+            printf(" %s", normalize(argv[idx++]));
         bb_putchar('\n');
     }
@@ -374 +379 @@
             /* For some reason, the original getopt gave no error
              * when there were no arguments. */
-            printf(" --\n");
+            puts(" --");
             return 0;
         }