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 /coreutils/rmdir.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 'coreutils/rmdir.c')
| -rw-r--r-- | coreutils/rmdir.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index c04ce78f8..955740494 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c | |||
| @@ -11,14 +11,6 @@ | |||
| 11 | //config: default y | 11 | //config: default y |
| 12 | //config: help | 12 | //config: help |
| 13 | //config: rmdir is used to remove empty directories. | 13 | //config: rmdir is used to remove empty directories. |
| 14 | //config: | ||
| 15 | //config:config FEATURE_RMDIR_LONG_OPTIONS | ||
| 16 | //config: bool "Enable long options" | ||
| 17 | //config: default y | ||
| 18 | //config: depends on RMDIR && LONG_OPTS | ||
| 19 | //config: help | ||
| 20 | //config: Support long options for the rmdir applet, including | ||
| 21 | //config: --ignore-fail-on-non-empty for compatibility with GNU rmdir. | ||
| 22 | 14 | ||
| 23 | //applet:IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir)) | 15 | //applet:IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir)) |
| 24 | 16 | ||
| @@ -31,12 +23,9 @@ | |||
| 31 | //usage: "[OPTIONS] DIRECTORY..." | 23 | //usage: "[OPTIONS] DIRECTORY..." |
| 32 | //usage:#define rmdir_full_usage "\n\n" | 24 | //usage:#define rmdir_full_usage "\n\n" |
| 33 | //usage: "Remove DIRECTORY if it is empty\n" | 25 | //usage: "Remove DIRECTORY if it is empty\n" |
| 34 | //usage: IF_FEATURE_RMDIR_LONG_OPTIONS( | ||
| 35 | //usage: "\n -p|--parents Include parents" | ||
| 36 | //usage: "\n --ignore-fail-on-non-empty" | ||
| 37 | //usage: ) | ||
| 38 | //usage: IF_NOT_FEATURE_RMDIR_LONG_OPTIONS( | ||
| 39 | //usage: "\n -p Include parents" | 26 | //usage: "\n -p Include parents" |
| 27 | //usage: IF_LONG_OPTS( | ||
| 28 | //usage: "\n --ignore-fail-on-non-empty" | ||
| 40 | //usage: ) | 29 | //usage: ) |
| 41 | //usage: | 30 | //usage: |
| 42 | //usage:#define rmdir_example_usage | 31 | //usage:#define rmdir_example_usage |
| @@ -49,7 +38,7 @@ | |||
| 49 | 38 | ||
| 50 | #define PARENTS (1 << 0) | 39 | #define PARENTS (1 << 0) |
| 51 | #define VERBOSE ((1 << 1) * ENABLE_FEATURE_VERBOSE) | 40 | #define VERBOSE ((1 << 1) * ENABLE_FEATURE_VERBOSE) |
| 52 | #define IGNORE_NON_EMPTY (1 << 2) | 41 | #define IGNORE_NON_EMPTY ((1 << 2) * ENABLE_LONG_OPTS) |
| 53 | 42 | ||
| 54 | int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 43 | int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 55 | int rmdir_main(int argc UNUSED_PARAM, char **argv) | 44 | int rmdir_main(int argc UNUSED_PARAM, char **argv) |
| @@ -58,8 +47,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv) | |||
| 58 | int flags; | 47 | int flags; |
| 59 | char *path; | 48 | char *path; |
| 60 | 49 | ||
| 61 | #if ENABLE_FEATURE_RMDIR_LONG_OPTIONS | 50 | flags = getopt32long(argv, "pv", |
| 62 | static const char rmdir_longopts[] ALIGN1 = | ||
| 63 | "parents\0" No_argument "p" | 51 | "parents\0" No_argument "p" |
| 64 | /* Debian etch: many packages fail to be purged or installed | 52 | /* Debian etch: many packages fail to be purged or installed |
| 65 | * because they desperately want this option: */ | 53 | * because they desperately want this option: */ |
| @@ -67,10 +55,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv) | |||
| 67 | IF_FEATURE_VERBOSE( | 55 | IF_FEATURE_VERBOSE( |
| 68 | "verbose\0" No_argument "v" | 56 | "verbose\0" No_argument "v" |
| 69 | ) | 57 | ) |
| 70 | ; | 58 | ); |
| 71 | applet_long_options = rmdir_longopts; | ||
| 72 | #endif | ||
| 73 | flags = getopt32(argv, "pv"); | ||
| 74 | argv += optind; | 59 | argv += optind; |
| 75 | 60 | ||
| 76 | if (!*argv) { | 61 | if (!*argv) { |
| @@ -86,7 +71,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv) | |||
| 86 | } | 71 | } |
| 87 | 72 | ||
| 88 | if (rmdir(path) < 0) { | 73 | if (rmdir(path) < 0) { |
| 89 | #if ENABLE_FEATURE_RMDIR_LONG_OPTIONS | 74 | #if ENABLE_LONG_OPTS |
| 90 | if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY) | 75 | if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY) |
| 91 | break; | 76 | break; |
| 92 | #endif | 77 | #endif |