- don't free user-supplied string (via -e)

[oweals/busybox.git] / util-linux / getopt.c

diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index a5e674368d87d7dddc326b1cd295679059cc36bf..4026303858230a73bae507e8040efd27efbca184 100644 (file)
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -22,7 +22,7 @@
  * Version 1.0.6: Tue Jun 27 2000
  *   No important changes
  * Version 1.1.0: Tue Jun 30 2000
- *   Added NLS support (partly written by Arkadiusz Mi<B6>kiewicz
+ *   Added NLS support (partly written by Arkadiusz Mickiewicz
  *     <misiek@misiek.eu.org>)
  * Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org>
  *  Removed --version/-V and --help/-h in
@@ -147,7 +147,7 @@ static const char *normalize(const char *arg)
 static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
 {
        int exit_code = 0; /* We assume everything will be OK */
-       unsigned opt;
+       int opt;
 #if ENABLE_GETOPT_LONG
        int longindex;
 #endif
@@ -155,7 +155,14 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
 
        if (quiet_errors) /* No error reporting from getopt(3) */
                opterr = 0;
-       optind = 0; /* Reset getopt(3) */
+
+       /* Reset getopt(3) (see libbb/getopt32.c for long rant) */
+#ifdef __GLIBC__
+       optind = 0;
+#else /* BSD style */
+       optind = 1;
+       /* optreset = 1; */
+#endif
 
        while (1) {
                opt =
@@ -166,7 +173,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
 #else
                        getopt(argc, argv, optstr);
 #endif
-               if (opt == EOF)
+               if (opt == -1)
                        break;
                if (opt == '?' || opt == ':' )
                        exit_code = 1;
@@ -183,7 +190,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
                                printf(" %s", normalize(optarg));
                        else {
                                printf(" -%c", opt);
-                               charptr = strchr(optstr,opt);
+                               charptr = strchr(optstr, opt);
                                if (charptr != NULL && *++charptr == ':')
                                        printf(" %s",
                                                normalize(optarg ? optarg : ""));
@@ -195,7 +202,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
                printf(" --");
                while (optind < argc)
                        printf(" %s", normalize(argv[optind++]));
-               puts("");
+               bb_putchar('\n');
        }
        return exit_code;
 }
@@ -231,14 +238,13 @@ static struct option *add_long_options(struct option *long_options, char *option
                                if (tlen == 0)
                                        bb_error_msg_and_die("empty long option specified");
                        }
-                       long_options = xrealloc(long_options,
-                                       sizeof(long_options[0]) * (long_nr+2));
+                       long_options = xrealloc_vector(long_options, 4, long_nr);
                        long_options[long_nr].has_arg = arg_opt;
-                       long_options[long_nr].flag = NULL;
+                       /*long_options[long_nr].flag = NULL; - xrealloc_vector did it */
                        long_options[long_nr].val = LONG_OPT;
                        long_options[long_nr].name = xstrdup(tokptr);
                        long_nr++;
-                       memset(&long_options[long_nr], 0, sizeof(long_options[0]));
+                       /*memset(&long_options[long_nr], 0, sizeof(long_options[0])); - xrealloc_vector did it */
                }
                tokptr = strtok(NULL, ", \t\n");
        }
@@ -248,9 +254,9 @@ static struct option *add_long_options(struct option *long_options, char *option
 
 static void set_shell(const char *new_shell)
 {
-       if (!strcmp(new_shell,"bash") || !strcmp(new_shell,"sh"))
+       if (!strcmp(new_shell, "bash") || !strcmp(new_shell, "sh"))
                return;
-       if (!strcmp(new_shell,"tcsh") || !strcmp(new_shell,"csh"))
+       if (!strcmp(new_shell, "tcsh") || !strcmp(new_shell, "csh"))
                option_mask32 |= SHELL_IS_TCSH;
        else
                bb_error_msg("unknown shell '%s', assuming bash", new_shell);
@@ -266,22 +272,21 @@ static void set_shell(const char *new_shell)
  */
 
 #if ENABLE_GETOPT_LONG
-static const struct option longopts[] = {
-       { "options",      required_argument, NULL, 'o' },
-       { "longoptions",  required_argument, NULL, 'l' },
-       { "quiet",        no_argument,       NULL, 'q' },
-       { "quiet-output", no_argument,       NULL, 'Q' },
-       { "shell",        required_argument, NULL, 's' },
-       { "test",         no_argument,       NULL, 'T' },
-       { "unquoted",     no_argument,       NULL, 'u' },
-       { "alternative",  no_argument,       NULL, 'a' },
-       { "name",         required_argument, NULL, 'n' },
-       { NULL, 0, NULL, 0 }
-};
+static const char getopt_longopts[] ALIGN1 =
+       "options\0"      Required_argument "o"
+       "longoptions\0"  Required_argument "l"
+       "quiet\0"        No_argument       "q"
+       "quiet-output\0" No_argument       "Q"
+       "shell\0"        Required_argument "s"
+       "test\0"         No_argument       "T"
+       "unquoted\0"     No_argument       "u"
+       "alternative\0"  No_argument       "a"
+       "name\0"         Required_argument "n"
+       ;
 #endif
 
-int getopt_main(int argc, char *argv[]);
-int getopt_main(int argc, char *argv[])
+int getopt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int getopt_main(int argc, char **argv)
 {
        char *optstr = NULL;
        char *name = NULL;
@@ -315,16 +320,15 @@ int getopt_main(int argc, char *argv[])
        }
 
 #if !ENABLE_GETOPT_LONG
-       opt = getopt32(argc, argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg);
+       opt = getopt32(argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg);
 #else
-       applet_long_options = longopts;
+       applet_long_options = getopt_longopts;
        opt_complementary = "l::";
-       opt = getopt32(argc, argv, "+o:n:qQs:Tual:",
+       opt = getopt32(argv, "+o:n:qQs:Tual:",
                                        &optstr, &name, &s_arg, &l_arg);
        /* Effectuate the read options for the applet itself */
        while (l_arg) {
-               long_options = add_long_options(long_options, l_arg->data);
-               l_arg = l_arg->link;
+               long_options = add_long_options(long_options, llist_pop(&l_arg));
        }
 #endif