aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-03-28 22:12:09 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-03-28 22:12:09 +0200
commit73dfdda92e20da718a9cb398ed762cc09c82e3a7 (patch)
treedcc9eefdb5e6b70cf473036c3995f967fca7b6e5 /findutils
parentb9b7aa1910907f59f1130667fbe7b870087e97f8 (diff)
downloadbusybox-73dfdda92e20da718a9cb398ed762cc09c82e3a7.tar.gz
grep: make errors other than "not found" result in exit code 2. Closes 8796
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils')
-rw-r--r--findutils/grep.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 10b69275a..dece90c58 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -681,11 +681,15 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
FILE *file;
int matched;
llist_t *fopt = NULL;
-
- /* do normal option parsing */
#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 */
+#if ENABLE_FEATURE_GREP_CONTEXT
/* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
* -m,-A,-B,-C have numeric param */
opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+";