dhcp: tweak comments, no code changes

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

diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index cd5679cff7de5b44de774abce699cb591bf5dfdb..1666d3d301ac86b4a165a5defd20abb6a65a7412 100644 (file)
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -1,11 +1,10 @@
 /* vi: set sw=4 ts=4: */
 /*
  * getopt.c - Enhanced implementation of BSD getopt(1)
- *   Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
+ * Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * Version 1.0-b4: Tue Sep 23 1997. First public release.
  * Version 1.0: Wed Nov 19 1997.
@@ -30,7 +29,7 @@
  *  Replaced our_malloc with xmalloc and our_realloc with xrealloc
  */
 //config:config GETOPT
-//config:      bool "getopt (5.6 kb)"
+//config:      bool "getopt (5.8 kb)"
 //config:      default y
 //config:      help
 //config:      The getopt utility is used to break up (parse) options in command
@@ -41,33 +40,19 @@
 //config:      wisely leave this disabled.
 //config:
 //config:config FEATURE_GETOPT_LONG
-//config:      bool "Support option -l"
-//config:      default y if LONG_OPTS
-//config:      depends on GETOPT
+//config:      bool "Support -l LONGOPTs"
+//config:      default y
+//config:      depends on GETOPT && LONG_OPTS
 //config:      help
 //config:      Enable support for long options (option -l).
 
-//applet:IF_GETOPT(APPLET(getopt, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_GETOPT(APPLET_NOEXEC(getopt, getopt, BB_DIR_BIN, BB_SUID_DROP, getopt))
 
 //kbuild:lib-$(CONFIG_GETOPT) += getopt.o
 
 //usage:#define getopt_trivial_usage
 //usage:       "[OPTIONS] [--] OPTSTRING PARAMS"
 //usage:#define getopt_full_usage "\n\n"
-//usage:       IF_LONG_OPTS(
-//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                       Version test (exits with 4)"
-//usage:     "\n       -u,--unquoted                   Don't quote output"
-//usage:       )
-//usage:       IF_NOT_LONG_OPTS(
 //usage:       IF_FEATURE_GETOPT_LONG(
 //usage:       "       -a              Allow long options starting with single -\n"
 //usage:       "       -l LOPT[,...]   Long options to recognize\n"
@@ -79,7 +64,6 @@
 //usage:     "\n       -s SHELL        Set shell quoting conventions"
 //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:"
@@ -411,8 +395,7 @@ int getopt_main(int argc, char **argv)
 #if !ENABLE_FEATURE_GETOPT_LONG
        opt = getopt32(argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg);
 #else
-       applet_long_options = getopt_longopts;
-       opt = getopt32(argv, "+o:n:qQs:Tual:*",
+       opt = getopt32long(argv, "+o:n:qQs:Tual:*", getopt_longopts,
                                        &optstr, &name, &s_arg, &l_arg);
        /* Effectuate the read options for the applet itself */
        while (l_arg) {