diff options
author | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:28:08 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:58:55 +0100 |
commit | 613f46218c53c8cabdbf0435653e74e0e0e91e1c (patch) | |
tree | ca06a7e7a3e4c861441acb4ea20648d7827fa6ae /editors/awk.c | |
parent | a0c61c9492723dd31681f878f9c68c92817a476d (diff) | |
parent | 237bedd499c58034a1355484d6d4d906f0180308 (diff) | |
download | busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.gz busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.bz2 busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/awk.c')
-rw-r--r-- | editors/awk.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c index 142ab670f..de3362cff 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::") | ||
81 | enum { | 78 | enum { |
82 | OPTBIT_F, /* define field separator */ | 79 | OPTBIT_F, /* define field separator */ |
83 | OPTBIT_v, /* define variable */ | 80 | OPTBIT_v, /* define variable */ |
@@ -3213,7 +3210,6 @@ int awk_main(int argc, char **argv) | |||
3213 | *s1 = '='; | 3210 | *s1 = '='; |
3214 | } | 3211 | } |
3215 | } | 3212 | } |
3216 | opt_complementary = OPTCOMPLSTR_AWK; | ||
3217 | opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL); | 3213 | opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL); |
3218 | argv += optind; | 3214 | argv += optind; |
3219 | argc -= optind; | 3215 | argc -= optind; |