[git commit] getopt32: remove applet_long_options
Denys Vlasenko
vda.linux at googlemail.com
Tue Aug 8 15:09:40 UTC 2017
commit: https://git.busybox.net/busybox/commit/?id=036585a911a5fe6c2cd77b808dd9150500f37272
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
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 at googlemail.com>
---
archival/bbunzip.c | 5 +--
archival/cpio.c | 7 ++--
archival/dpkg.c | 3 +-
archival/gzip.c | 7 ++--
archival/tar.c | 11 ++++---
coreutils/chown.c | 7 ++--
coreutils/cp.c | 7 ++--
coreutils/date.c | 5 ++-
coreutils/env.c | 21 +++---------
coreutils/expand.c | 53 +++++++-----------------------
coreutils/install.c | 18 +++++++----
coreutils/ls.c | 3 +-
coreutils/mkdir.c | 33 +++++++------------
coreutils/mv.c | 38 +++++++---------------
coreutils/nl.c | 5 ++-
coreutils/nproc.c | 1 -
coreutils/od_bloaty.c | 7 ++--
coreutils/rmdir.c | 27 ++++------------
coreutils/touch.c | 13 +++++---
coreutils/uname.c | 3 +-
debianutils/run_parts.c | 14 ++++----
debianutils/start_stop_daemon.c | 12 ++++---
editors/diff.c | 10 +++---
editors/patch_bbox.c | 3 +-
editors/sed.c | 8 ++---
findutils/xargs.c | 9 ++----
include/libbb.h | 25 +++++++++------
libbb/getopt32.c | 71 ++++++++++++++++++++++++++---------------
libbb/vfork_daemon_rexec.c | 17 +++++-----
loginutils/addgroup.c | 14 ++------
loginutils/adduser.c | 25 +++------------
loginutils/chpasswd.c | 3 +-
loginutils/cryptpw.c | 4 +--
loginutils/deluser.c | 5 ++-
miscutils/conspy.c | 4 +--
miscutils/nandwrite.c | 8 ++---
modutils/modprobe.c | 3 +-
networking/ftpgetput.c | 10 +++---
networking/hostname.c | 12 +++----
networking/ifenslave.c | 14 +++-----
networking/ipcalc.c | 10 +++---
networking/udhcp/d6_dhcpc.c | 4 +--
networking/udhcp/dhcpc.c | 4 +--
networking/udhcp/dumpleases.c | 3 +-
networking/wget.c | 9 ++++--
selinux/chcon.c | 41 +++++++-----------------
selinux/runcon.c | 22 ++-----------
util-linux/flock.c | 3 +-
util-linux/fsfreeze.c | 9 +++---
util-linux/fstrim.c | 3 +-
util-linux/getopt.c | 22 ++-----------
util-linux/hwclock.c | 28 ++++++++--------
util-linux/nsenter.c | 35 ++++----------------
util-linux/rtcwake.c | 4 +--
util-linux/script.c | 4 +--
util-linux/setpriv.c | 9 ++++--
util-linux/unshare.c | 3 +-
57 files changed, 299 insertions(+), 459 deletions(-)
Patch is too large, so refusing to show it
More information about the busybox-cvs
mailing list