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 /coreutils/sort.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 'coreutils/sort.c')
-rw-r--r-- | coreutils/sort.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c index 9139d9f47..34a41999b 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c | |||
@@ -73,7 +73,7 @@ | |||
73 | */ | 73 | */ |
74 | 74 | ||
75 | /* These are sort types */ | 75 | /* These are sort types */ |
76 | static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:t:"; | 76 | static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:*t:"; |
77 | enum { | 77 | enum { |
78 | FLAG_n = 1, /* Numeric sort */ | 78 | FLAG_n = 1, /* Numeric sort */ |
79 | FLAG_g = 2, /* Sort using strtod() */ | 79 | FLAG_g = 2, /* Sort using strtod() */ |
@@ -358,8 +358,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv) | |||
358 | 358 | ||
359 | /* Parse command line options */ | 359 | /* Parse command line options */ |
360 | /* -o and -t can be given at most once */ | 360 | /* -o and -t can be given at most once */ |
361 | opt_complementary = "o--o:t--t:" /* -t, -o: at most one of each */ | 361 | opt_complementary = "o--o:t--t"; /* -t, -o: at most one of each */ |
362 | "k::"; /* -k takes list */ | ||
363 | opts = getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t); | 362 | opts = getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t); |
364 | /* global b strips leading and trailing spaces */ | 363 | /* global b strips leading and trailing spaces */ |
365 | if (opts & FLAG_b) | 364 | if (opts & FLAG_b) |