diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 16:38:18 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 17:09:40 +0200 |
| commit | 036585a911a5fe6c2cd77b808dd9150500f37272 (patch) | |
| tree | aa7c65b4d09c74642f622a1ef5da982d6ed4940a /util-linux/nsenter.c | |
| parent | 00677b5e35dd97f415f0b0bef25b55865f55ab33 (diff) | |
| download | busybox-w32-036585a911a5fe6c2cd77b808dd9150500f37272.tar.gz busybox-w32-036585a911a5fe6c2cd77b808dd9150500f37272.tar.bz2 busybox-w32-036585a911a5fe6c2cd77b808dd9150500f37272.zip | |
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>
Diffstat (limited to 'util-linux/nsenter.c')
| -rw-r--r-- | util-linux/nsenter.c | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c index 12c86b0ed..d91b0b509 100644 --- a/util-linux/nsenter.c +++ b/util-linux/nsenter.c | |||
| @@ -13,14 +13,6 @@ | |||
| 13 | //config: select PLATFORM_LINUX | 13 | //config: select PLATFORM_LINUX |
| 14 | //config: help | 14 | //config: help |
| 15 | //config: Run program with namespaces of other processes. | 15 | //config: Run program with namespaces of other processes. |
| 16 | //config: | ||
| 17 | //config:config FEATURE_NSENTER_LONG_OPTS | ||
| 18 | //config: bool "Enable long options" | ||
| 19 | //config: default y | ||
| 20 | //config: depends on NSENTER && LONG_OPTS | ||
| 21 | //config: help | ||
| 22 | //config: Support long options for the nsenter applet. This makes | ||
| 23 | //config: the busybox implementation more compatible with upstream. | ||
| 24 | 16 | ||
| 25 | //applet:IF_NSENTER(APPLET(nsenter, BB_DIR_USR_BIN, BB_SUID_DROP)) | 17 | //applet:IF_NSENTER(APPLET(nsenter, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| 26 | 18 | ||
| @@ -28,22 +20,6 @@ | |||
| 28 | 20 | ||
| 29 | //usage:#define nsenter_trivial_usage | 21 | //usage:#define nsenter_trivial_usage |
| 30 | //usage: "[OPTIONS] [PROG [ARGS]]" | 22 | //usage: "[OPTIONS] [PROG [ARGS]]" |
| 31 | //usage:#if ENABLE_FEATURE_NSENTER_LONG_OPTS | ||
| 32 | //usage:#define nsenter_full_usage "\n" | ||
| 33 | //usage: "\n -t,--target PID Target process to get namespaces from" | ||
| 34 | //usage: "\n -m,--mount[=FILE] Enter mount namespace" | ||
| 35 | //usage: "\n -u,--uts[=FILE] Enter UTS namespace (hostname etc)" | ||
| 36 | //usage: "\n -i,--ipc[=FILE] Enter System V IPC namespace" | ||
| 37 | //usage: "\n -n,--net[=FILE] Enter network namespace" | ||
| 38 | //usage: "\n -p,--pid[=FILE] Enter pid namespace" | ||
| 39 | //usage: "\n -U,--user[=FILE] Enter user namespace" | ||
| 40 | //usage: "\n -S,--setuid UID Set uid in entered namespace" | ||
| 41 | //usage: "\n -G,--setgid GID Set gid in entered namespace" | ||
| 42 | //usage: "\n --preserve-credentials Don't touch uids or gids" | ||
| 43 | //usage: "\n -r,--root[=DIR] Set root directory" | ||
| 44 | //usage: "\n -w,--wd[=DIR] Set working directory" | ||
| 45 | //usage: "\n -F,--no-fork Don't fork before exec'ing PROG" | ||
| 46 | //usage:#else | ||
| 47 | //usage:#define nsenter_full_usage "\n" | 23 | //usage:#define nsenter_full_usage "\n" |
| 48 | //usage: "\n -t PID Target process to get namespaces from" | 24 | //usage: "\n -t PID Target process to get namespaces from" |
| 49 | //usage: "\n -m[FILE] Enter mount namespace" | 25 | //usage: "\n -m[FILE] Enter mount namespace" |
| @@ -54,10 +30,12 @@ | |||
| 54 | //usage: "\n -U[FILE] Enter user namespace" | 30 | //usage: "\n -U[FILE] Enter user namespace" |
| 55 | //usage: "\n -S UID Set uid in entered namespace" | 31 | //usage: "\n -S UID Set uid in entered namespace" |
| 56 | //usage: "\n -G GID Set gid in entered namespace" | 32 | //usage: "\n -G GID Set gid in entered namespace" |
| 33 | //usage: IF_LONG_OPTS( | ||
| 34 | //usage: "\n --preserve-credentials Don't touch uids or gids" | ||
| 35 | //usage: ) | ||
| 57 | //usage: "\n -r[DIR] Set root directory" | 36 | //usage: "\n -r[DIR] Set root directory" |
| 58 | //usage: "\n -w[DIR] Set working directory" | 37 | //usage: "\n -w[DIR] Set working directory" |
| 59 | //usage: "\n -F Don't fork before exec'ing PROG" | 38 | //usage: "\n -F Don't fork before exec'ing PROG" |
| 60 | //usage:#endif | ||
| 61 | 39 | ||
| 62 | #include <sched.h> | 40 | #include <sched.h> |
| 63 | #ifndef CLONE_NEWUTS | 41 | #ifndef CLONE_NEWUTS |
| @@ -101,7 +79,7 @@ enum { | |||
| 101 | OPT_root = 1 << 9, | 79 | OPT_root = 1 << 9, |
| 102 | OPT_wd = 1 << 10, | 80 | OPT_wd = 1 << 10, |
| 103 | OPT_nofork = 1 << 11, | 81 | OPT_nofork = 1 << 11, |
| 104 | OPT_prescred = (1 << 12) * ENABLE_FEATURE_NSENTER_LONG_OPTS, | 82 | OPT_prescred = (1 << 12) * ENABLE_LONG_OPTS, |
| 105 | }; | 83 | }; |
| 106 | enum { | 84 | enum { |
| 107 | NS_USR_POS = 0, | 85 | NS_USR_POS = 0, |
| @@ -130,7 +108,7 @@ static const struct namespace_descr ns_list[] = { | |||
| 130 | */ | 108 | */ |
| 131 | static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F"; | 109 | static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F"; |
| 132 | 110 | ||
| 133 | #if ENABLE_FEATURE_NSENTER_LONG_OPTS | 111 | #if ENABLE_LONG_OPTS |
| 134 | static const char nsenter_longopts[] ALIGN1 = | 112 | static const char nsenter_longopts[] ALIGN1 = |
| 135 | "user\0" Optional_argument "U" | 113 | "user\0" Optional_argument "U" |
| 136 | "ipc\0" Optional_argument "i" | 114 | "ipc\0" Optional_argument "i" |
| @@ -190,8 +168,7 @@ int nsenter_main(int argc UNUSED_PARAM, char **argv) | |||
| 190 | 168 | ||
| 191 | memset(ns_ctx_list, 0, sizeof(ns_ctx_list)); | 169 | memset(ns_ctx_list, 0, sizeof(ns_ctx_list)); |
| 192 | 170 | ||
| 193 | IF_FEATURE_NSENTER_LONG_OPTS(applet_long_options = nsenter_longopts); | 171 | opts = getopt32long(argv, opt_str, nsenter_longopts, |
| 194 | opts = getopt32(argv, opt_str, | ||
| 195 | &ns_ctx_list[NS_USR_POS].path, | 172 | &ns_ctx_list[NS_USR_POS].path, |
| 196 | &ns_ctx_list[NS_IPC_POS].path, | 173 | &ns_ctx_list[NS_IPC_POS].path, |
| 197 | &ns_ctx_list[NS_UTS_POS].path, | 174 | &ns_ctx_list[NS_UTS_POS].path, |