aboutsummaryrefslogtreecommitdiff
path: root/editors/awk.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-07-06 21:58:02 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-07-06 21:58:02 +0200
commit237bedd499c58034a1355484d6d4d906f0180308 (patch)
tree42a789f8867ba3bc6ef0cea30fb18f5553d447a0 /editors/awk.c
parent0844b5afe2cd60d46b7f2ad0fac8c2818d0780b3 (diff)
downloadbusybox-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 'editors/awk.c')
-rw-r--r--editors/awk.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c
index 69816464d..d0269b9f4 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -72,12 +72,9 @@
72 72
73 73
74#define OPTSTR_AWK \ 74#define OPTSTR_AWK \
75 "F:v:f:" \ 75 "F:v:*f:*" \
76 IF_FEATURE_AWK_GNU_EXTENSIONS("e:") \ 76 IF_FEATURE_AWK_GNU_EXTENSIONS("e:*") \
77 "W:" 77 "W:"
78#define OPTCOMPLSTR_AWK \
79 "v::f::" \
80 IF_FEATURE_AWK_GNU_EXTENSIONS("e::")
81enum { 78enum {
82 OPTBIT_F, /* define field separator */ 79 OPTBIT_F, /* define field separator */
83 OPTBIT_v, /* define variable */ 80 OPTBIT_v, /* define variable */
@@ -3209,7 +3206,6 @@ int awk_main(int argc, char **argv)
3209 *s1 = '='; 3206 *s1 = '=';
3210 } 3207 }
3211 } 3208 }
3212 opt_complementary = OPTCOMPLSTR_AWK;
3213 opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL); 3209 opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL);
3214 argv += optind; 3210 argv += optind;
3215 argc -= optind; 3211 argc -= optind;