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>
This commit is contained in:
Denys Vlasenko
@ -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,
|
||||
|
||||
Reference in New Issue
Block a user