emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getopt32: remove applet_long_options

Browse Source 
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>
This commit is contained in:
Denys Vlasenko
2017-08-08 16:38:18 +02:00
parent 00677b5e35
commit 036585a911
57 changed files with 301 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
util-linux/flock.c
View File

@@ -44,11 +44,10 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
"unlock\0" No_argument "u"
"nonblock\0" No_argument "n"
;
applet_long_options = flock_longopts;
#endif
opt_complementary = "-1";
opt = getopt32(argv, "+sxnu");
opt = getopt32long(argv, "+sxnu", flock_longopts);
argv += optind;
if (argv[1]) {

9
util-linux/fsfreeze.c
View File

@@ -36,15 +36,14 @@ int fsfreeze_main(int argc UNUSED_PARAM, char **argv)
unsigned opts;
int fd;
applet_long_options =
"freeze\0" No_argument "\xff"
"unfreeze\0" No_argument "\xfe"
;
/* exactly one non-option arg: the mountpoint */
/* one of opts is required */
/* opts are mutually exclusive */
opt_complementary = "=1:""\xff:\xfe:""\xff--\xfe:\xfe--\xff";
opts = getopt32(argv, "");
opts = getopt32long(argv, "",
"freeze\0" No_argument "\xff"
"unfreeze\0" No_argument "\xfe"
);
fd = xopen(argv[optind], O_RDONLY);
/* Works with NULL arg on linux-4.8.0 */

3
util-linux/fstrim.c
View File

@@ -69,11 +69,10 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
"minimum\0" Required_argument "m"
"verbose\0" No_argument "v"
;
applet_long_options = fstrim_longopts;
#endif
opt_complementary = "=1"; /* exactly one non-option arg: the mountpoint */
opts = getopt32(argv, "o:l:m:v", &arg_o, &arg_l, &arg_m);
opts = getopt32long(argv, "o:l:m:v", fstrim_longopts, &arg_o, &arg_l, &arg_m);
memset(&range, 0, sizeof(range));
range.len = ULLONG_MAX;

22
util-linux/getopt.c
View File

@@ -42,8 +42,8 @@
//config:
//config:config FEATURE_GETOPT_LONG
//config: bool "Support -l LONGOPTs"
//config: default y if LONG_OPTS
//config: depends on GETOPT
//config: default y
//config: depends on GETOPT && LONG_OPTS
//config: help
//config: Enable support for long options (option -l).
@@ -54,20 +54,6 @@
//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 +65,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 +396,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) {

28
util-linux/hwclock.c
View File

@@ -16,11 +16,6 @@
//config: shutdown in the hardware clock, so the hardware will keep the
//config: correct time when Linux is _not_ running.
//config:
//config:config FEATURE_HWCLOCK_LONG_OPTIONS
//config: bool "Support long options (--hctosys,...)"
//config: default y
//config: depends on HWCLOCK && LONG_OPTS
//config:
//config:config FEATURE_HWCLOCK_ADJTIME_FHS
//config: bool "Use FHS /var/lib/hwclock/adjtime"
//config: default n # util-linux-ng in Fedora 13 still uses /etc/adjtime
@@ -293,12 +288,12 @@ static void set_system_clock_timezone(int utc)
}
//usage:#define hwclock_trivial_usage
//usage: IF_FEATURE_HWCLOCK_LONG_OPTIONS(
//usage: "[-r|--show] [-s|--hctosys] [-w|--systohc] [-t|--systz]"
//usage: " [-l|--localtime] [-u|--utc]"
//usage: IF_LONG_OPTS(
//usage: "[-r|--show] [-s|--hctosys] [-w|--systohc] [--systz]"
//usage: " [--localtime] [-u|--utc]"
//usage: " [-f|--rtc FILE]"
//usage: )
//usage: IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS(
//usage: IF_NOT_LONG_OPTS(
//usage: "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
//usage: )
//usage:#define hwclock_full_usage "\n\n"
@@ -306,12 +301,18 @@ static void set_system_clock_timezone(int utc)
//usage: "\n -r Show hardware clock time"
//usage: "\n -s Set system time from hardware clock"
//usage: "\n -w Set hardware clock from system time"
//usage: "\n -t Set in-kernel timezone, correct system time"
//usage: IF_LONG_OPTS(
//usage: "\n --systz Set in-kernel timezone, correct system time"
//usage: )
//usage: "\n if hardware clock is in local time"
//usage: "\n -u Assume hardware clock is kept in UTC"
//usage: "\n -l Assume hardware clock is kept in local time"
//usage: IF_LONG_OPTS(
//usage: "\n --localtime Assume hardware clock is kept in local time"
//usage: )
//usage: "\n -f FILE Use specified device (e.g. /dev/rtc2)"
//TODO: get rid of incompatible -t and -l aliases to --systz and --localtime
#define HWCLOCK_OPT_LOCALTIME 0x01
#define HWCLOCK_OPT_UTC 0x02
#define HWCLOCK_OPT_SHOW 0x04
@@ -327,7 +328,7 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
unsigned opt;
int utc;
#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
#if ENABLE_LONG_OPTS
static const char hwclock_longopts[] ALIGN1 =
"localtime\0" No_argument "l" /* short opt is non-standard */
"utc\0" No_argument "u"
@@ -337,14 +338,13 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
"systz\0" No_argument "t" /* short opt is non-standard */
"rtc\0" Required_argument "f"
;
applet_long_options = hwclock_longopts;
#endif
/* Initialize "timezone" (libc global variable) */
tzset();
opt_complementary = "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l";
opt = getopt32(argv, "lurswtf:", &rtcname);
opt = getopt32long(argv, "lurswtf:", hwclock_longopts, &rtcname);
/* If -u or -l wasn't given check if we are using utc */
if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))

35
util-linux/nsenter.c
View File

@@ -13,14 +13,6 @@
//config: select PLATFORM_LINUX
//config: help
//config: Run program with namespaces of other processes.
//config:
//config:config FEATURE_NSENTER_LONG_OPTS
//config: bool "Enable long options"
//config: default y
//config: depends on NSENTER && LONG_OPTS
//config: help
//config: Support long options for the nsenter applet. This makes
//config: the busybox implementation more compatible with upstream.
//applet:IF_NSENTER(APPLET(nsenter, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -28,22 +20,6 @@
//usage:#define nsenter_trivial_usage
//usage: "[OPTIONS] [PROG [ARGS]]"
//usage:#if ENABLE_FEATURE_NSENTER_LONG_OPTS
//usage:#define nsenter_full_usage "\n"
//usage: "\n -t,--target PID Target process to get namespaces from"
//usage: "\n -m,--mount[=FILE] Enter mount namespace"
//usage: "\n -u,--uts[=FILE] Enter UTS namespace (hostname etc)"
//usage: "\n -i,--ipc[=FILE] Enter System V IPC namespace"
//usage: "\n -n,--net[=FILE] Enter network namespace"
//usage: "\n -p,--pid[=FILE] Enter pid namespace"
//usage: "\n -U,--user[=FILE] Enter user namespace"
//usage: "\n -S,--setuid UID Set uid in entered namespace"
//usage: "\n -G,--setgid GID Set gid in entered namespace"
//usage: "\n --preserve-credentials Don't touch uids or gids"
//usage: "\n -r,--root[=DIR] Set root directory"
//usage: "\n -w,--wd[=DIR] Set working directory"
//usage: "\n -F,--no-fork Don't fork before exec'ing PROG"
//usage:#else
//usage:#define nsenter_full_usage "\n"
//usage: "\n -t PID Target process to get namespaces from"
//usage: "\n -m[FILE] Enter mount namespace"
@@ -54,10 +30,12 @@
//usage: "\n -U[FILE] Enter user namespace"
//usage: "\n -S UID Set uid in entered namespace"
//usage: "\n -G GID Set gid in entered namespace"
//usage: IF_LONG_OPTS(
//usage: "\n --preserve-credentials Don't touch uids or gids"
//usage: )
//usage: "\n -r[DIR] Set root directory"
//usage: "\n -w[DIR] Set working directory"
//usage: "\n -F Don't fork before exec'ing PROG"
//usage:#endif
#include <sched.h>
#ifndef CLONE_NEWUTS
@@ -101,7 +79,7 @@ enum {
OPT_root = 1 << 9,
OPT_wd = 1 << 10,
OPT_nofork = 1 << 11,
OPT_prescred = (1 << 12) * ENABLE_FEATURE_NSENTER_LONG_OPTS,
OPT_prescred = (1 << 12) * ENABLE_LONG_OPTS,
};
enum {
NS_USR_POS = 0,
@@ -130,7 +108,7 @@ static const struct namespace_descr ns_list[] = {
*/
static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F";
#if ENABLE_FEATURE_NSENTER_LONG_OPTS
#if ENABLE_LONG_OPTS
static const char nsenter_longopts[] ALIGN1 =
"user\0" Optional_argument "U"
"ipc\0" Optional_argument "i"
@@ -190,8 +168,7 @@ int nsenter_main(int argc UNUSED_PARAM, char **argv)
memset(ns_ctx_list, 0, sizeof(ns_ctx_list));
IF_FEATURE_NSENTER_LONG_OPTS(applet_long_options = nsenter_longopts);
opts = getopt32(argv, opt_str,
opts = getopt32long(argv, opt_str, nsenter_longopts,
&ns_ctx_list[NS_USR_POS].path,
&ns_ctx_list[NS_IPC_POS].path,
&ns_ctx_list[NS_UTS_POS].path,

4
util-linux/rtcwake.c
View File

@@ -154,11 +154,11 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
"seconds\0" Required_argument "s"
"time\0" Required_argument "t"
;
applet_long_options = rtcwake_longopts;
#endif
/* Must have -s or -t, exclusive */
opt_complementary = "s:t:s--t:t--s";
opt = getopt32(argv, "alud:m:s:t:", &rtcname, &suspend, &opt_seconds, &opt_time);
opt = getopt32long(argv, "alud:m:s:t:", rtcwake_longopts,
&rtcname, &suspend, &opt_seconds, &opt_time);
/* this is the default
if (opt & RTCWAKE_OPT_AUTO)

4
util-linux/script.c
View File

@@ -78,12 +78,10 @@ int script_main(int argc UNUSED_PARAM, char **argv)
"quiet\0" No_argument "q"
"timing\0" Optional_argument "t"
;
applet_long_options = script_longopts;
#endif
opt_complementary = "?1"; /* max one arg */
opt = getopt32(argv, "ac:fqt::", &shell_arg, &str_t);
opt = getopt32long(argv, "ac:fqt::", script_longopts, &shell_arg, &str_t);
//argc -= optind;
argv += optind;
if (argv[0]) {

9
util-linux/setpriv.c
View File

@@ -421,9 +421,12 @@ int setpriv_main(int argc UNUSED_PARAM, char **argv)
int opts;
IF_FEATURE_SETPRIV_CAPABILITIES(char *inh_caps, *ambient_caps;)
applet_long_options = setpriv_longopts;
opts = getopt32(argv, "+"IF_FEATURE_SETPRIV_DUMP("d")
IF_FEATURE_SETPRIV_CAPABILITIES("\xfe:\xfd:", &inh_caps, &ambient_caps));
opts = getopt32long(argv,
"+"IF_FEATURE_SETPRIV_DUMP("d")
IF_FEATURE_SETPRIV_CAPABILITIES("\xfe:\xfd:"),
setpriv_longopts
IF_FEATURE_SETPRIV_CAPABILITIES(, &inh_caps, &ambient_caps)
);
argv += optind;
#if ENABLE_FEATURE_SETPRIV_DUMP

3
util-linux/unshare.c
View File

@@ -220,8 +220,7 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
":ru" /* --map-root-user or -r implies -u */
":\xfd""m" /* --mount-proc implies -m */
;
applet_long_options = unshare_longopts;
opts = getopt32(argv, opt_str,
opts = getopt32long(argv, opt_str, unshare_longopts,
&proc_mnt_target, &prop_str, &setgrp_str,
&ns_ctx_list[NS_MNT_POS].path,
&ns_ctx_list[NS_UTS_POS].path,