From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 28 Mar 2016 20:12:09 +0000 (+0200)
Subject: grep: make errors other than "not found" result in exit code 2. Closes 8796
X-Git-Tag: 1_25_0~93
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=73dfdda92e20da718a9cb398ed762cc09c82e3a7;p=oweals%2Fbusybox.git

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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

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+";