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

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

@@ -26 +26 @@
  *     <misiek@misiek.eu.org>)
  * Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org>
- *  Removed --version/-V and --help/-h in
+ *  Removed --version/-V and --help/-h
  *  Removed parse_error(), using bb_error_msg() from Busybox instead
  *  Replaced our_malloc with xmalloc and our_realloc with xrealloc
@@ -32 +32 @@
  */
 
-#include <getopt.h>
+//usage:#define getopt_trivial_usage
+//usage:       "[OPTIONS] [--] OPTSTRING PARAMS"
+//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:     "\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:    )
+//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:     "\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:    )
+//usage:     "\n"
+//usage:     "\nExample:"
+//usage:     "\n"
+//usage:     "\nO=`getopt -l bb: -- ab:c:: \"$@\"` || exit 1"
+//usage:     "\neval set -- \"$O\""
+//usage:     "\nwhile true; do"
+//usage:     "\n    case \"$1\" in"
+//usage:     "\n    -a) echo A; shift;;"
+//usage:     "\n    -b|--bb) echo \"B:'$2'\"; shift 2;;"
+//usage:     "\n    -c) case \"$2\" in"
+//usage:     "\n        \"\")   echo C; shift 2;;"
+//usage:     "\n        *)  echo \"C:'$2'\"; shift 2;;"
+//usage:     "\n        esac;;"
+//usage:     "\n    --) shift; break;;"
+//usage:     "\n    *)  echo Error; exit 1;;"
+//usage:     "\n    esac"
+//usage:     "\ndone"
+//usage:
+//usage:#define getopt_example_usage
+//usage:       "$ cat getopt.test\n"
+//usage:       "#!/bin/sh\n"
+//usage:       "GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n"
+//usage:       "       -n 'example.busybox' -- \"$@\"`\n"
+//usage:       "if [ $? != 0 ]; then exit 1; fi\n"
+//usage:       "eval set -- \"$GETOPT\"\n"
+//usage:       "while true; do\n"
+//usage:       " case $1 in\n"
+//usage:       "   -a|--a-long) echo \"Option a\"; shift;;\n"
+//usage:       "   -b|--b-long) echo \"Option b, argument '$2'\"; shift 2;;\n"
+//usage:       "   -c|--c-long)\n"
+//usage:       "     case \"$2\" in\n"
+//usage:       "       \"\") echo \"Option c, no argument\"; shift 2;;\n"
+//usage:       "       *)  echo \"Option c, argument '$2'\"; shift 2;;\n"
+//usage:       "     esac;;\n"
+//usage:       "   --) shift; break;;\n"
+//usage:       "   *) echo \"Internal error!\"; exit 1;;\n"
+//usage:       " esac\n"
+//usage:       "done\n"
+
+#if ENABLE_FEATURE_GETOPT_LONG
+# include <getopt.h>
+#endif
 #include "libbb.h"
 
@@ -291 +357 @@
 int getopt_main(int argc, char **argv)
 {
+    int n;
     char *optstr = NULL;
     char *name = NULL;
@@ -303 +370 @@
     compatible = getenv("GETOPT_COMPATIBLE"); /* used as yes/no flag */
 
-    if (argc == 1) {
+    if (!argv[1]) {
         if (compatible) {
             /* For some reason, the original getopt gave no error
-               when there were no arguments. */
+             * when there were no arguments. */
             printf(" --\n");
             return 0;
@@ -314 +381 @@
 
     if (argv[1][0] != '-' || compatible) {
-        char *s;
+        char *s = argv[1];
 
         option_mask32 |= OPT_u; /* quoting off */
-        s = xstrdup(argv[1] + strspn(argv[1], "-+"));
+        s = xstrdup(s + strspn(s, "-+"));
         argv[1] = argv[0];
         return generate_output(argv+1, argc-1, s, long_options);
@@ -344 +411 @@
 
     /* All options controlling the applet have now been parsed */
+    n = optind - 1;
     if (!optstr) {
-        if (optind >= argc)
+        optstr = argv[++n];
+        if (!optstr)
             bb_error_msg_and_die("missing optstring argument");
-        optstr = argv[optind++];
-    }
-
-    argv[optind-1] = name ? name : argv[0];
-    return generate_output(argv+optind-1, argc-optind+1, optstr, long_options);
+    }
+
+    argv[n] = name ? name : argv[0];
+    return generate_output(argv + n, argc - n, optstr, long_options);
 }