emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: make errors other than "not found" result in exit code 2. Closes 8796

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-03-28 22:12:09 +02:00
parent b9b7aa1910
commit 73dfdda92e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
findutils/grep.c
View File

@ -681,11 +681,15 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
FILE *file; FILE *file;
int matched; int matched;
llist_t *fopt = NULL; llist_t *fopt = NULL;
#if ENABLE_FEATURE_GREP_CONTEXT
int Copt, opts;
#endif
/* For grep, exitcode of 1 is "not found". Other errors are 2: */
xfunc_error_retval = 2;
/* do normal option parsing */ /* do normal option parsing */
#if ENABLE_FEATURE_GREP_CONTEXT #if ENABLE_FEATURE_GREP_CONTEXT
int Copt, opts;
/* -H unsets -h; -C unsets -A,-B; -e,-f are lists; /* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
* -m,-A,-B,-C have numeric param */ * -m,-A,-B,-C have numeric param */
opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+"; opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+";