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/expand.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/expand.c')
| -rw-r--r-- | coreutils/expand.c | 53 |
1 files changed, 11 insertions, 42 deletions
diff --git a/coreutils/expand.c b/coreutils/expand.c index 64f2a539d..fa3ff18f4 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c | |||
| @@ -26,21 +26,11 @@ | |||
| 26 | //config: help | 26 | //config: help |
| 27 | //config: By default, convert all tabs to spaces. | 27 | //config: By default, convert all tabs to spaces. |
| 28 | //config: | 28 | //config: |
| 29 | //config:config FEATURE_EXPAND_LONG_OPTIONS | ||
| 30 | //config: bool "Enable long options" | ||
| 31 | //config: default y | ||
| 32 | //config: depends on EXPAND && LONG_OPTS | ||
| 33 | //config: | ||
| 34 | //config:config UNEXPAND | 29 | //config:config UNEXPAND |
| 35 | //config: bool "unexpand (6 kb)" | 30 | //config: bool "unexpand (6 kb)" |
| 36 | //config: default y | 31 | //config: default y |
| 37 | //config: help | 32 | //config: help |
| 38 | //config: By default, convert only leading sequences of blanks to tabs. | 33 | //config: By default, convert only leading sequences of blanks to tabs. |
| 39 | //config: | ||
| 40 | //config:config FEATURE_UNEXPAND_LONG_OPTIONS | ||
| 41 | //config: bool "Enable long options" | ||
| 42 | //config: default y | ||
| 43 | //config: depends on UNEXPAND && LONG_OPTS | ||
| 44 | 34 | ||
| 45 | //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) | 35 | //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| 46 | // APPLET_ODDNAME:name main location suid_type help | 36 | // APPLET_ODDNAME:name main location suid_type help |
| @@ -53,29 +43,16 @@ | |||
| 53 | //usage: "[-i] [-t N] [FILE]..." | 43 | //usage: "[-i] [-t N] [FILE]..." |
| 54 | //usage:#define expand_full_usage "\n\n" | 44 | //usage:#define expand_full_usage "\n\n" |
| 55 | //usage: "Convert tabs to spaces, writing to stdout\n" | 45 | //usage: "Convert tabs to spaces, writing to stdout\n" |
| 56 | //usage: IF_FEATURE_EXPAND_LONG_OPTIONS( | ||
| 57 | //usage: "\n -i,--initial Don't convert tabs after non blanks" | ||
| 58 | //usage: "\n -t,--tabs N Tabstops every N chars" | ||
| 59 | //usage: ) | ||
| 60 | //usage: IF_NOT_FEATURE_EXPAND_LONG_OPTIONS( | ||
| 61 | //usage: "\n -i Don't convert tabs after non blanks" | 46 | //usage: "\n -i Don't convert tabs after non blanks" |
| 62 | //usage: "\n -t Tabstops every N chars" | 47 | //usage: "\n -t Tabstops every N chars" |
| 63 | //usage: ) | ||
| 64 | 48 | ||
| 65 | //usage:#define unexpand_trivial_usage | 49 | //usage:#define unexpand_trivial_usage |
| 66 | //usage: "[-fa][-t N] [FILE]..." | 50 | //usage: "[-fa][-t N] [FILE]..." |
| 67 | //usage:#define unexpand_full_usage "\n\n" | 51 | //usage:#define unexpand_full_usage "\n\n" |
| 68 | //usage: "Convert spaces to tabs, writing to stdout\n" | 52 | //usage: "Convert spaces to tabs, writing to stdout\n" |
| 69 | //usage: IF_FEATURE_UNEXPAND_LONG_OPTIONS( | ||
| 70 | //usage: "\n -a,--all Convert all blanks" | ||
| 71 | //usage: "\n -f,--first-only Convert only leading blanks" | ||
| 72 | //usage: "\n -t,--tabs N Tabstops every N chars" | ||
| 73 | //usage: ) | ||
| 74 | //usage: IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS( | ||
| 75 | //usage: "\n -a Convert all blanks" | 53 | //usage: "\n -a Convert all blanks" |
| 76 | //usage: "\n -f Convert only leading blanks" | 54 | //usage: "\n -f Convert only leading blanks" |
| 77 | //usage: "\n -t N Tabstops every N chars" | 55 | //usage: "\n -t N Tabstops every N chars" |
| 78 | //usage: ) | ||
| 79 | 56 | ||
| 80 | #include "libbb.h" | 57 | #include "libbb.h" |
| 81 | #include "unicode.h" | 58 | #include "unicode.h" |
| @@ -188,31 +165,23 @@ int expand_main(int argc UNUSED_PARAM, char **argv) | |||
| 188 | unsigned opt; | 165 | unsigned opt; |
| 189 | int exit_status = EXIT_SUCCESS; | 166 | int exit_status = EXIT_SUCCESS; |
| 190 | 167 | ||
| 191 | #if ENABLE_FEATURE_EXPAND_LONG_OPTIONS | ||
| 192 | static const char expand_longopts[] ALIGN1 = | ||
| 193 | /* name, has_arg, val */ | ||
| 194 | "initial\0" No_argument "i" | ||
| 195 | "tabs\0" Required_argument "t" | ||
| 196 | ; | ||
| 197 | #endif | ||
| 198 | #if ENABLE_FEATURE_UNEXPAND_LONG_OPTIONS | ||
| 199 | static const char unexpand_longopts[] ALIGN1 = | ||
| 200 | /* name, has_arg, val */ | ||
| 201 | "first-only\0" No_argument "i" | ||
| 202 | "tabs\0" Required_argument "t" | ||
| 203 | "all\0" No_argument "a" | ||
| 204 | ; | ||
| 205 | #endif | ||
| 206 | init_unicode(); | 168 | init_unicode(); |
| 207 | 169 | ||
| 208 | if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) { | 170 | if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) { |
| 209 | IF_FEATURE_EXPAND_LONG_OPTIONS(applet_long_options = expand_longopts); | 171 | opt = getopt32long(argv, "it:", |
| 210 | opt = getopt32(argv, "it:", &opt_t); | 172 | "initial\0" No_argument "i" |
| 173 | "tabs\0" Required_argument "t" | ||
| 174 | , &opt_t | ||
| 175 | ); | ||
| 211 | } else { | 176 | } else { |
| 212 | IF_FEATURE_UNEXPAND_LONG_OPTIONS(applet_long_options = unexpand_longopts); | ||
| 213 | /* -t NUM sets also -a */ | 177 | /* -t NUM sets also -a */ |
| 214 | opt_complementary = "ta"; | 178 | opt_complementary = "ta"; |
| 215 | opt = getopt32(argv, "ft:a", &opt_t); | 179 | opt = getopt32long(argv, "ft:a", |
| 180 | "first-only\0" No_argument "i" | ||
| 181 | "tabs\0" Required_argument "t" | ||
| 182 | "all\0" No_argument "a" | ||
| 183 | , &opt_t | ||
| 184 | ); | ||
| 216 | /* -f --first-only is the default */ | 185 | /* -f --first-only is the default */ |
| 217 | if (!(opt & OPT_ALL)) opt |= OPT_INITIAL; | 186 | if (!(opt & OPT_ALL)) opt |= OPT_INITIAL; |
| 218 | } | 187 | } |