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

Exit with the appropriate value when grepping multiple files.

Browse Source
This commit is contained in:
Matt Kraai 2000-08-06 15:25:53 +00:00
parent 46ade97983
commit deb95f69b6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
findutils/grep.c
View File

@ -42,7 +42,7 @@ static int suppress_err_msgs = 0;
/* globals */ /* globals */
static regex_t regex; /* storage space for compiled regular expression */ static regex_t regex; /* storage space for compiled regular expression */
static int nmatches = 0; /* keeps track of the number of matches */ static int matched; /* keeps track of whether we ever matched */
static char *cur_file = NULL; /* the current file we are reading */ static char *cur_file = NULL; /* the current file we are reading */
@ -64,6 +64,7 @@ static void grep_file(FILE *file)
char *line = NULL; char *line = NULL;
int ret; int ret;
int linenum = 0; int linenum = 0;
int nmatches = 0;
while ((line = get_line_from_file(file)) != NULL) { while ((line = get_line_from_file(file)) != NULL) {
linenum++; linenum++;
@ -96,8 +97,9 @@ static void grep_file(FILE *file)
printf("%i\n", nmatches); printf("%i\n", nmatches);
} }
/* reset number of matches found to zero */ /* record if we matched */
nmatches = 0; if (nmatches != 0)
matched = 1;
} }
extern int grep_main(int argc, char **argv) extern int grep_main(int argc, char **argv)
@ -176,7 +178,7 @@ extern int grep_main(int argc, char **argv)
regfree(&regex); regfree(&regex);
if (nmatches == 0) if (!matched)
return 1; return 1;
return 0; return 0;

10
grep.c
View File

@ -42,7 +42,7 @@ static int suppress_err_msgs = 0;
/* globals */ /* globals */
static regex_t regex; /* storage space for compiled regular expression */ static regex_t regex; /* storage space for compiled regular expression */
static int nmatches = 0; /* keeps track of the number of matches */ static int matched; /* keeps track of whether we ever matched */
static char *cur_file = NULL; /* the current file we are reading */ static char *cur_file = NULL; /* the current file we are reading */
@ -64,6 +64,7 @@ static void grep_file(FILE *file)
char *line = NULL; char *line = NULL;
int ret; int ret;
int linenum = 0; int linenum = 0;
int nmatches = 0;
while ((line = get_line_from_file(file)) != NULL) { while ((line = get_line_from_file(file)) != NULL) {
linenum++; linenum++;
@ -96,8 +97,9 @@ static void grep_file(FILE *file)
printf("%i\n", nmatches); printf("%i\n", nmatches);
} }
/* reset number of matches found to zero */ /* record if we matched */
nmatches = 0; if (nmatches != 0)
matched = 1;
} }
extern int grep_main(int argc, char **argv) extern int grep_main(int argc, char **argv)
@ -176,7 +178,7 @@ extern int grep_main(int argc, char **argv)
regfree(&regex); regfree(&regex);
if (nmatches == 0) if (!matched)
return 1; return 1;
return 0; return 0;