diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-06 21:58:02 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-06 21:58:02 +0200 |
| commit | 237bedd499c58034a1355484d6d4d906f0180308 (patch) | |
| tree | 42a789f8867ba3bc6ef0cea30fb18f5553d447a0 /miscutils/ubi_tools.c | |
| parent | 0844b5afe2cd60d46b7f2ad0fac8c2818d0780b3 (diff) | |
| download | busybox-w32-237bedd499c58034a1355484d6d4d906f0180308.tar.gz busybox-w32-237bedd499c58034a1355484d6d4d906f0180308.tar.bz2 busybox-w32-237bedd499c58034a1355484d6d4d906f0180308.zip | |
getopt32: add new syntax of 'o:+' and 'o:*' for -o NUM and -o LIST
In many cases, this aqllows to drop use of opt_complementary.
Approximately -400 bytes:
function old new delta
getopt32 1423 1502 +79
opt_string 17 18 +1
OPT_STR 24 25 +1
uniq_main 416 406 -10
timeout_main 279 269 -10
sulogin_main 270 260 -10
readprofile_main 1825 1815 -10
ps_main 543 533 -10
pidof_main 245 235 -10
pgrep_main 611 601 -10
od_main 2600 2590 -10
mkfs_minix_main 2684 2674 -10
mkfs_ext2_main 2603 2593 -10
microcom_main 712 702 -10
makemime_main 315 305 -10
ionice_main 282 272 -10
inetd_main 2074 2064 -10
ifplugd_main 1144 1134 -10
halt_main 353 343 -10
getopt_main 636 626 -10
fdisk_main 2854 2844 -10
env_main 206 196 -10
dmesg_main 319 309 -10
conspy_main 1214 1204 -10
awk_main 981 971 -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220) Total: -139 bytes
text data bss dec hex filename
919373 906 14060 934339 e41c3 busybox_old
918969 906 14060 933935 e402f busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/ubi_tools.c')
| -rw-r--r-- | miscutils/ubi_tools.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index 4364bc807..8e55e9577 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c | |||
| @@ -134,8 +134,8 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv) | |||
| 134 | #define OPTION_a (1 << 5) | 134 | #define OPTION_a (1 << 5) |
| 135 | #define OPTION_t (1 << 6) | 135 | #define OPTION_t (1 << 6) |
| 136 | if (do_mkvol) { | 136 | if (do_mkvol) { |
| 137 | opt_complementary = "-1:d+:n+:a+:O+"; | 137 | opt_complementary = "-1"; |
| 138 | opts = getopt32(argv, "md:n:N:s:a:t:O:", | 138 | opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+", |
| 139 | &dev_num, &vol_id, | 139 | &dev_num, &vol_id, |
| 140 | &vol_name, &size_bytes_str, &alignment, &type, | 140 | &vol_name, &size_bytes_str, &alignment, &type, |
| 141 | &vid_hdr_offset | 141 | &vid_hdr_offset |
| @@ -146,8 +146,8 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv) | |||
| 146 | opts = getopt32(argv, "s:at", &size_bytes_str); | 146 | opts = getopt32(argv, "s:at", &size_bytes_str); |
| 147 | opts *= OPTION_s; | 147 | opts *= OPTION_s; |
| 148 | } else { | 148 | } else { |
| 149 | opt_complementary = "-1:m+:d+:n+:a+"; | 149 | opt_complementary = "-1"; |
| 150 | opts = getopt32(argv, "m:d:n:N:s:a:t:", | 150 | opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:", |
| 151 | &mtd_num, &dev_num, &vol_id, | 151 | &mtd_num, &dev_num, &vol_id, |
| 152 | &vol_name, &size_bytes_str, &alignment, &type | 152 | &vol_name, &size_bytes_str, &alignment, &type |
| 153 | ); | 153 | ); |