getopt32: remove applet_long_options

FEATURE_GETOPT_LONG made dependent on LONG_OPTS.

The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS	FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS	FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS		FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS	FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS	FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS	FEATURE_RUNCON_LONG_OPTIONS

They either had a small number of long options, or their long options are
essential.

Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.

To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
	#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
                /* We try to use --gid, not -g, because "standard" addgroup
                 * has no short option -g, it has only long --gid.
                 */
                argv[1] = (char*)"--gid";
	#else
                /* Breaks if system in fact does NOT use busybox addgroup */
                argv[1] = (char*)"-g";
	#endif

xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.

hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime

Shorten help texts by omitting long option when short opt alternative exists.

Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.

function                                             old     new   delta
getopt32                                            1350      22   -1328
vgetopt32                                              -    1318   +1318
getopt32long                                           -      24     +24
tftpd_main                                           562     567      +5
scan_recursive                                       376     380      +4
collect_cpu                                          545     546      +1
date_main                                           1096    1095      -1
hostname_main                                        262     259      -3
uname_main                                           259     255      -4
setpriv_main                                         362     358      -4
rmdir_main                                           191     187      -4
mv_main                                              562     558      -4
ipcalc_main                                          548     544      -4
ifenslave_main                                       641     637      -4
gzip_main                                            192     188      -4
gunzip_main                                           77      73      -4
fsfreeze_main                                         81      77      -4
flock_main                                           318     314      -4
deluser_main                                         337     333      -4
cp_main                                              374     370      -4
chown_main                                           175     171      -4
applet_long_options                                    4       -      -4
xargs_main                                           894     889      -5
wget_main                                           2540    2535      -5
udhcpc_main                                         2767    2762      -5
touch_main                                           436     431      -5
tar_main                                            1014    1009      -5
start_stop_daemon_main                              1033    1028      -5
sed_main                                             682     677      -5
script_main                                         1082    1077      -5
run_parts_main                                       330     325      -5
rtcwake_main                                         459     454      -5
od_main                                             2169    2164      -5
nl_main                                              201     196      -5
modprobe_main                                        773     768      -5
mkdir_main                                           160     155      -5
ls_main                                              568     563      -5
install_main                                         773     768      -5
hwclock_main                                         411     406      -5
getopt_main                                          622     617      -5
fstrim_main                                          256     251      -5
env_main                                             198     193      -5
dumpleases_main                                      635     630      -5
dpkg_main                                           3991    3986      -5
diff_main                                           1355    1350      -5
cryptpw_main                                         233     228      -5
cpio_main                                            593     588      -5
conspy_main                                         1135    1130      -5
chpasswd_main                                        313     308      -5
adduser_main                                         887     882      -5
addgroup_main                                        416     411      -5
ftpgetput_main                                       351     345      -6
get_terminal_width_height                            242     234      -8
expand_main                                          690     680     -10
static.expand_longopts                                18       -     -18
static.unexpand_longopts                              27       -     -27
mkdir_longopts                                        28       -     -28
env_longopts                                          30       -     -30
static.ifenslave_longopts                             34       -     -34
mv_longopts                                           46       -     -46
static.rmdir_longopts                                 48       -     -48
packed_usage                                       31739   31687     -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840)      Total: -488 bytes
   text	   data	    bss	    dec	    hex	filename
 915681	    485	   6880	 923046	  e15a6	busybox_old
 915428	    485	   6876	 922789	  e14a5	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

8 files changed, 33 insertions, 33 deletions

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index d70f4ca77..1fc20364f 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -361,12 +361,14 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
         /*
          * Decipher the command line
          */
+        opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
 #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
-        applet_long_options = ftpgetput_longopts;
+        getopt32long(argv, "cvu:p:P:", ftpgetput_longopts,
+#else
+        getopt32(argv, "cvu:p:P:",
 #endif
-        opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
-        getopt32(argv, "cvu:p:P:", &user, &password, &port,
-                                        &verbose_flag, &do_continue);
+                        &user, &password, &port, &verbose_flag, &do_continue
+        );
         argv += optind;
 
         /* We want to do exactly _one_ DNS lookup, since some
diff --git a/networking/hostname.c b/networking/hostname.c
index ea0ff95b7..d87f6562f 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -132,8 +132,9 @@ int hostname_main(int argc UNUSED_PARAM, char **argv)
         char *buf;
         char *hostname_str;
 
-#if ENABLE_LONG_OPTS
-        applet_long_options =
+        /* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
+         * supports hostname's options too (not just -v as manpage says) */
+        opts = getopt32(argv, "dfisF:v", &hostname_str,
                 "domain\0"     No_argument "d"
                 "fqdn\0"       No_argument "f"
         //Enable if seen in active use in some distro:
@@ -142,12 +143,7 @@ int hostname_main(int argc UNUSED_PARAM, char **argv)
         //      "short\0"      No_argument "s"
         //      "verbose\0"    No_argument "v"
                 "file\0"       No_argument "F"
-                ;
-
-#endif
-        /* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
-         * supports hostname's options too (not just -v as manpage says) */
-        opts = getopt32(argv, "dfisF:v", &hostname_str);
+        );
         argv += optind;
         buf = safe_gethostname();
         if (ENABLE_DNSDOMAINNAME) {
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index a845c4e7e..5e769b61d 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -493,19 +493,15 @@ int ifenslave_main(int argc UNUSED_PARAM, char **argv)
                 OPT_d = (1 << 1),
                 OPT_f = (1 << 2),
         };
-#if ENABLE_LONG_OPTS
-        static const char ifenslave_longopts[] ALIGN1 =
+
+        INIT_G();
+
+        opt = getopt32long(argv, "cdfa",
                 "change-active\0"  No_argument "c"
                 "detach\0"         No_argument "d"
                 "force\0"          No_argument "f"
                 /* "all-interfaces\0" No_argument "a" */
-                ;
-
-        applet_long_options = ifenslave_longopts;
-#endif
-        INIT_G();
-
-        opt = getopt32(argv, "cdfa");
+        );
         argv += optind;
         if (opt & (opt-1)) /* Only one option can be given */
                 bb_show_usage();
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 83937828f..1d5db969c 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -108,6 +108,11 @@ int get_prefix(unsigned long netmask);
                 "silent\0"    No_argument "s" // don’t ever display error messages
 # endif
                 ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,ipcalc_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int ipcalc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -125,11 +130,8 @@ int ipcalc_main(int argc UNUSED_PARAM, char **argv)
 #define ipaddr    (s_ipaddr.s_addr)
         char *ipstr;
 
-#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
-        applet_long_options = ipcalc_longopts;
-#endif
         opt_complementary = "-1:?2"; /* minimum 1 arg, maximum 2 args */
-        opt = getopt32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs"));
+        opt = GETOPT32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs") LONGOPTS);
         argv += optind;
         if (opt & SILENT)
                 logmode = LOGMODE_NONE; /* suppress error_msg() output */
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 43081efca..84969aa81 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1103,12 +1103,12 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         /* Parse command line */
         /* O,x: list; -T,-t,-A take numeric param */
         IF_UDHCP_VERBOSE(opt_complementary = "vv";)
-        IF_LONG_OPTS(applet_long_options = udhcpc6_longopts;)
-        opt = getopt32(argv, "i:np:qRr:s:T:+t:+SA:+O:*ox:*f"
+        opt = getopt32long(argv, "i:np:qRr:s:T:+t:+SA:+O:*ox:*f"
                 USE_FOR_MMU("b")
                 ///IF_FEATURE_UDHCPC_ARPING("a")
                 IF_FEATURE_UDHCP_PORT("P:")
                 "v"
+                , udhcpc6_longopts
                 , &client_config.interface, &client_config.pidfile, &str_r /* i,p */
                 , &client_config.script /* s */
                 , &discover_timeout, &discover_retries, &tryagain_timeout /* T,t,A */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index ccf04993d..5f87f8586 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1297,12 +1297,12 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         /* Parse command line */
         /* O,x: list; -T,-t,-A take numeric param */
         IF_UDHCP_VERBOSE(opt_complementary = "vv";)
-        IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
-        opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
+        opt = getopt32long(argv, "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
                 USE_FOR_MMU("b")
                 IF_FEATURE_UDHCPC_ARPING("a::")
                 IF_FEATURE_UDHCP_PORT("P:")
                 "v"
+                , udhcpc_longopts
                 , &str_V, &str_h, &str_h, &str_F
                 , &client_config.interface, &client_config.pidfile, &str_r /* i,p */
                 , &client_config.script /* s */
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 8aafc0d57..fb1860ff6 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -51,12 +51,11 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                 "decimal\0"   No_argument       "d"
                 ;
 
-        applet_long_options = dumpleases_longopts;
 #endif
         init_unicode();
 
         opt_complementary = "=0:a--r:r--a";
-        opt = getopt32(argv, "arf:d", &file);
+        opt = getopt32long(argv, "arf:d", dumpleases_longopts, &file);
 
         fd = xopen(file, O_RDONLY);
 
diff --git a/networking/wget.c b/networking/wget.c
index e47c9a51b..b661f727b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1365,6 +1365,11 @@ IF_DESKTOP(	"no-clobber\0"       No_argument       "\xf0")
 IF_DESKTOP(     "no-host-directories\0" No_argument    "\xf0")
 IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
                 ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,wget_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
@@ -1381,11 +1386,10 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
         G.user_agent = "Wget"; /* "User-Agent" header field */
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
-        applet_long_options = wget_longopts;
 #endif
         opt_complementary = "-1" /* at least one URL */
                 IF_FEATURE_WGET_LONG_OPTIONS(":\xff::"); /* --header is a list */
-        getopt32(argv, "cqSO:P:Y:U:T:+"
+        GETOPT32(argv, "cqSO:P:Y:U:T:+"
                 /*ignored:*/ "t:"
                 /*ignored:*/ "n::"
                 /* wget has exactly four -n<letter> opts, all of which we can ignore:
@@ -1396,6 +1400,7 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
                  * "n::" above says that we accept -n[ARG].
                  * Specifying "n:" would be a bug: "-n ARG" would eat ARG!
                  */
+                LONGOPTS
                 , &G.fname_out, &G.dir_prefix,
                 &G.proxy_flag, &G.user_agent,
                 IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),