[git commit] grep: accept and ignore --color[=anything]
Denys Vlasenko
vda.linux at googlemail.com
Fri Jul 13 18:40:40 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=8717b14f376e38998512c022b3d2b1af6e877e5e
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
grep_main 827 834 +7
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
findutils/grep.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/findutils/grep.c b/findutils/grep.c
index 88de0d4ef..3e8ea9239 100644
--- 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
More information about the busybox-cvs
mailing list