svn commit: r228319 - head/usr.bin/grep
Gabor Kovesdan
gabor at FreeBSD.org
Wed Dec 7 12:25:29 UTC 2011
Author: gabor
Date: Wed Dec 7 12:25:28 2011
New Revision: 228319
URL: http://svn.freebsd.org/changeset/base/228319
Log:
- Match GNU behavior of exit code
- Rename variable that has a different meaning now
PR: bin/162930
Submitted by: Jan Beich <jbeich at tormail.net>
MFC after: 1 week
Modified:
head/usr.bin/grep/grep.c
head/usr.bin/grep/grep.h
head/usr.bin/grep/util.c
Modified: head/usr.bin/grep/grep.c
==============================================================================
--- head/usr.bin/grep/grep.c Wed Dec 7 11:06:18 2011 (r228318)
+++ head/usr.bin/grep/grep.c Wed Dec 7 12:25:28 2011 (r228319)
@@ -148,7 +148,7 @@ static inline const char *init_color(con
bool first = true; /* flag whether we are processing the first match */
bool prev; /* flag whether or not the previous line matched */
int tail; /* lines left to print */
-bool notfound; /* file not found */
+bool file_err; /* file reading error */
/*
* Prints usage information and returns 2.
@@ -728,5 +728,5 @@ main(int argc, char *argv[])
/* Find out the correct return value according to the
results and the command line option. */
- exit(c ? (notfound ? (qflag ? 0 : 2) : 0) : (notfound ? 2 : 1));
+ exit(c ? (file_err ? (qflag ? 0 : 2) : 0) : (file_err ? 2 : 1));
}
Modified: head/usr.bin/grep/grep.h
==============================================================================
--- head/usr.bin/grep/grep.h Wed Dec 7 11:06:18 2011 (r228318)
+++ head/usr.bin/grep/grep.h Wed Dec 7 12:25:28 2011 (r228319)
@@ -119,7 +119,7 @@ extern char *label;
extern const char *color;
extern int binbehave, devbehave, dirbehave, filebehave, grepbehave, linkbehave;
-extern bool first, matchall, notfound, prev;
+extern bool file_err, first, matchall, prev;
extern int tail;
extern unsigned int dpatterns, fpatterns, patterns;
extern struct pat *pattern;
Modified: head/usr.bin/grep/util.c
==============================================================================
--- head/usr.bin/grep/util.c Wed Dec 7 11:06:18 2011 (r228318)
+++ head/usr.bin/grep/util.c Wed Dec 7 12:25:28 2011 (r228319)
@@ -130,7 +130,7 @@ grep_tree(char **argv)
case FTS_DNR:
/* FALLTHROUGH */
case FTS_ERR:
- notfound = true;
+ file_err = true;
if(!sflag)
warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
break;
@@ -195,10 +195,9 @@ procfile(const char *fn)
f = grep_open(fn);
}
if (f == NULL) {
+ file_err = true;
if (!sflag)
warn("%s", fn);
- if (errno == ENOENT)
- notfound = true;
return (0);
}
More information about the svn-src-head
mailing list