diff options
author | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-14 09:56:52 +0000 |
---|---|---|
committer | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-14 09:56:52 +0000 |
commit | 01624413c323108075899977a28fc904b2af0ff3 (patch) | |
tree | 06f15d778a64ba361219d8227f87422173bf0da8 /findutils/grep.c | |
parent | 846218fbf12a4870648037175fe7cdf286501569 (diff) | |
download | busybox-w32-01624413c323108075899977a28fc904b2af0ff3.tar.gz busybox-w32-01624413c323108075899977a28fc904b2af0ff3.tar.bz2 busybox-w32-01624413c323108075899977a28fc904b2af0ff3.zip |
- new bb_opt_complementally syntax, use [-:?] only - 'free' chars
- new bb_getopt_ulflags features: check max and min args, convert first argv to options special for ar and tar applets
- use bb_default_error_retval for env applet
git-svn-id: svn://busybox.net/trunk/busybox@11859 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'findutils/grep.c')
-rw-r--r-- | findutils/grep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 323e4afc6..3c5167e28 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -264,7 +264,7 @@ extern int grep_main(int argc, char **argv) | |||
264 | char *slines_before; | 264 | char *slines_before; |
265 | char *Copt; | 265 | char *Copt; |
266 | 266 | ||
267 | bb_opt_complementally = "H-h:e*:f*:C-AB"; | 267 | bb_opt_complementally = "H-h:e::f::C-AB"; |
268 | opt = bb_getopt_ulflags(argc, argv, | 268 | opt = bb_getopt_ulflags(argc, argv, |
269 | GREP_OPTS GREP_OPT_CONTEXT OPT_EGREP, | 269 | GREP_OPTS GREP_OPT_CONTEXT OPT_EGREP, |
270 | &pattern_head, &fopt, | 270 | &pattern_head, &fopt, |
@@ -299,7 +299,7 @@ extern int grep_main(int argc, char **argv) | |||
299 | } | 299 | } |
300 | #else | 300 | #else |
301 | /* with auto sanity checks */ | 301 | /* with auto sanity checks */ |
302 | bb_opt_complementally = "H-h:e*:f*:c-n:q-n:l-n"; | 302 | bb_opt_complementally = "H-h:e::f::c-n:q-n:l-n"; |
303 | opt = bb_getopt_ulflags(argc, argv, GREP_OPTS OPT_EGREP, | 303 | opt = bb_getopt_ulflags(argc, argv, GREP_OPTS OPT_EGREP, |
304 | &pattern_head, &fopt); | 304 | &pattern_head, &fopt); |
305 | #endif | 305 | #endif |