projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79fb6ac
)
grep: accept and ignore --color[=anything]
author
Denys Vlasenko
<vda.linux@googlemail.com>
Fri, 13 Jul 2018 18:40:40 +0000
(20:40 +0200)
committer
Denys Vlasenko
<vda.linux@googlemail.com>
Fri, 13 Jul 2018 18:40:40 +0000
(20:40 +0200)
function old new delta
grep_main 827 834 +7
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
findutils/grep.c
patch
|
blob
|
history
diff --git
a/findutils/grep.c
b/findutils/grep.c
index 88de0d4ef18c6e18037e1465db0ee0e7c294034f..3e8ea9239dcfeebf5b186a0728b50b2cb9cf13da 100644
(file)
--- a/
findutils/grep.c
+++ b/
findutils/grep.c
@@
-704,10
+704,15
@@
int grep_main(int argc UNUSED_PARAM, char **argv)
/* do normal option parsing */
#if ENABLE_FEATURE_GREP_CONTEXT
/* -H unsets -h; -C unsets -A,-B */
- opts = getopt32(argv,
- "^" OPTSTR_GREP "\0" "H-h:C-AB",
+ opts = getopt32long(argv, "^"
+ OPTSTR_GREP
+ "\0"
+ "H-h:C-AB",
+ "color\0" Optional_argument "\xff",
&pattern_head, &fopt, &max_matches,
- &lines_after, &lines_before, &Copt);
+ &lines_after, &lines_before, &Copt
+ , NULL
+ );
if (opts & OPT_C) {
/* -C unsets prev -A and -B, but following -A or -B