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>

2 files changed, 14 insertions, 49 deletions

diff --git a/selinux/chcon.c b/selinux/chcon.c
index ae87fb554..3cf9e928a 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -13,11 +13,6 @@
 //config:       depends on SELINUX
 //config:       help
 //config:       Enable support to change the security context of file.
-//config:
-//config:config FEATURE_CHCON_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on CHCON && LONG_OPTS
 
 //applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -26,34 +21,22 @@
 //usage:#define chcon_trivial_usage
 //usage:       "[OPTIONS] CONTEXT FILE..."
 //usage:       "\n      chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..."
-//usage:        IF_FEATURE_CHCON_LONG_OPTIONS(
 //usage:       "\n      chcon [OPTIONS] --reference=RFILE FILE..."
-//usage:        )
+//usage:
 //usage:#define chcon_full_usage "\n\n"
 //usage:       "Change the security context of each FILE to CONTEXT\n"
-//usage:        IF_FEATURE_CHCON_LONG_OPTIONS(
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:     "\n        -c,--changes            Report changes made"
-//usage:     "\n        -h,--no-dereference     Affect symlinks instead of their targets"
-//usage:     "\n        -f,--silent,--quiet     Suppress most error messages"
-//usage:     "\n        --reference RFILE       Use RFILE's group instead of using a CONTEXT value"
-//usage:     "\n        -u,--user USER          Set user/role/type/range in the target"
-//usage:     "\n        -r,--role ROLE          security context"
-//usage:     "\n        -t,--type TYPE"
-//usage:     "\n        -l,--range RANGE"
-//usage:     "\n        -R,--recursive          Recurse"
-//usage:        )
-//usage:        IF_NOT_FEATURE_CHCON_LONG_OPTIONS(
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -c      Report changes made"
 //usage:     "\n        -h      Affect symlinks instead of their targets"
 //usage:     "\n        -f      Suppress most error messages"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --reference RFILE Use RFILE's group instead of using a CONTEXT value"
+//usage:        )
 //usage:     "\n        -u USER Set user/role/type/range in the target security context"
 //usage:     "\n        -r ROLE"
 //usage:     "\n        -t TYPE"
 //usage:     "\n        -l RNG"
 //usage:     "\n        -R      Recurse"
-//usage:        )
 
 #include <selinux/context.h>
 
@@ -68,7 +51,7 @@
 #define OPT_TYPE                (1<<6)  /* 't' */
 #define OPT_RANGE               (1<<7)  /* 'l' */
 #define OPT_VERBOSE             (1<<8)  /* 'v' */
-#define OPT_REFERENCE           ((1<<9) * ENABLE_FEATURE_CHCON_LONG_OPTIONS)
+#define OPT_REFERENCE           ((1<<9) * ENABLE_LONG_OPTS)
 #define OPT_COMPONENT_SPECIFIED (OPT_USER | OPT_ROLE | OPT_TYPE | OPT_RANGE)
 
 static char *user = NULL;
@@ -157,7 +140,7 @@ skip:
         return rc;
 }
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
 static const char chcon_longopts[] ALIGN1 =
         "recursive\0"      No_argument       "R"
         "changes\0"        No_argument       "c"
@@ -180,20 +163,18 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
         char *fname;
         int i, errors = 0;
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
-        applet_long_options = chcon_longopts;
-#endif
         opt_complementary = "-1"  /* at least 1 param */
                 ":?"  /* error if exclusivity constraints are violated */
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
                 ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
 #endif
                 ":f--v:v--f";  /* 'verbose' and 'quiet' are exclusive */
-        getopt32(argv, "Rchfu:r:t:l:v",
-                &user, &role, &type, &range, &reference_file);
+        getopt32long(argv, "Rchfu:r:t:l:v", chcon_longopts,
+                &user, &role, &type, &range, &reference_file
+        );
         argv += optind;
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
         if (option_mask32 & OPT_REFERENCE) {
                 /* FIXME: lgetfilecon() should be used when '-h' is specified.
                  * But current implementation follows the original one. */
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 09082d6c2..199da25c6 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -34,11 +34,6 @@
 //config:       depends on SELINUX
 //config:       help
 //config:       Enable support to run command in specified security context.
-//config:
-//config:config FEATURE_RUNCON_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on RUNCON && LONG_OPTS
 
 //applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -50,20 +45,11 @@
 //usage:#define runcon_full_usage "\n\n"
 //usage:       "Run PROG in a different security context\n"
 //usage:     "\n        CONTEXT         Complete security context\n"
-//usage:        IF_FEATURE_RUNCON_LONG_OPTIONS(
-//usage:     "\n        -c,--compute    Compute process transition context before modifying"
-//usage:     "\n        -t,--type TYPE  Type (for same role as parent)"
-//usage:     "\n        -u,--user USER  User identity"
-//usage:     "\n        -r,--role ROLE  Role"
-//usage:     "\n        -l,--range RNG  Levelrange"
-//usage:        )
-//usage:        IF_NOT_FEATURE_RUNCON_LONG_OPTIONS(
 //usage:     "\n        -c      Compute process transition context before modifying"
 //usage:     "\n        -t TYPE Type (for same role as parent)"
 //usage:     "\n        -u USER User identity"
 //usage:     "\n        -r ROLE Role"
 //usage:     "\n        -l RNG  Levelrange"
-//usage:        )
 
 #include <selinux/context.h>
 /* from deprecated <selinux/flask.h>: */
@@ -108,7 +94,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
         return con;
 }
 
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
 static const char runcon_longopts[] ALIGN1 =
         "user\0"    Required_argument "u"
         "role\0"    Required_argument "r"
@@ -140,11 +126,9 @@ int runcon_main(int argc UNUSED_PARAM, char **argv)
 
         selinux_or_die();
 
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
-        applet_long_options = runcon_longopts;
-#endif
         opt_complementary = "-1";
-        opts = getopt32(argv, "r:t:u:l:ch", &role, &type, &user, &range);
+        opts = getopt32long(argv, "r:t:u:l:ch", runcon_longopts,
+                                &role, &type, &user, &range);
         argv += optind;
 
         if (!(opts & OPTS_CONTEXT_COMPONENT)) {