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

Rick Richardson writes:

Browse Source 
Here is a patch that adds egrep -L support (the opposite of egrep -l).

I realize this is probably too late for 1.0.  But I offer it for your
future consideration.

egrep -L is used in some networking startup scripts I inherited.

-Rick
This commit is contained in:
Eric Andersen 2004-05-26 11:47:55 +00:00
parent ee70fa5523
commit dec7f81370
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
findutils/grep.c
View File

@ -34,7 +34,7 @@
/* options */ /* options */
#define GREP_OPTS "lnqvscFiHhe:f:" #define GREP_OPTS "lnqvscFiHhe:f:L"
#define GREP_OPT_l 1 #define GREP_OPT_l 1
static char print_files_with_matches; static char print_files_with_matches;
#define GREP_OPT_n 2 #define GREP_OPT_n 2
@ -55,15 +55,17 @@ static char fgrep_flag;
#define GREP_OPT_h 512 #define GREP_OPT_h 512
#define GREP_OPT_e 1024 #define GREP_OPT_e 1024
#define GREP_OPT_f 2048 #define GREP_OPT_f 2048
#define GREP_OPT_L 4096
static char print_files_without_matches;
#ifdef CONFIG_FEATURE_GREP_CONTEXT #ifdef CONFIG_FEATURE_GREP_CONTEXT
#define GREP_OPT_CONTEXT "A:B:C" #define GREP_OPT_CONTEXT "A:B:C"
#define GREP_OPT_A 4096 #define GREP_OPT_A 8192
#define GREP_OPT_B 8192 #define GREP_OPT_B 16384
#define GREP_OPT_C 16384 #define GREP_OPT_C 32768
#define GREP_OPT_E 32768U #define GREP_OPT_E 65536
#else #else
#define GREP_OPT_CONTEXT "" #define GREP_OPT_CONTEXT ""
#define GREP_OPT_E 4096 #define GREP_OPT_E 8192
#endif #endif
#ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS #ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS
# define OPT_EGREP "E" # define OPT_EGREP "E"
@ -147,7 +149,7 @@ static int grep_file(FILE *file)
free(line); free(line);
/* if we found a match but were told to be quiet, stop here */ /* if we found a match but were told to be quiet, stop here */
if (be_quiet) if (be_quiet || print_files_without_matches)
return -1; return -1;
/* keep track of matches */ /* keep track of matches */
@ -227,6 +229,11 @@ static int grep_file(FILE *file)
puts(cur_file); puts(cur_file);
} }
/* grep -L: print just the filename, but only if we didn't grep the line in the file */
if (print_files_without_matches && nmatches == 0) {
puts(cur_file);
}
return nmatches; return nmatches;
} }
@ -290,7 +297,7 @@ extern int grep_main(int argc, char **argv)
bb_error_msg_and_die("invalid context length argument"); bb_error_msg_and_die("invalid context length argument");
} }
/* sanity checks after parse may be invalid numbers ;-) */ /* sanity checks after parse may be invalid numbers ;-) */
if ((opt & (GREP_OPT_c|GREP_OPT_q|GREP_OPT_l))) { if ((opt & (GREP_OPT_c|GREP_OPT_q|GREP_OPT_l|GREP_OPT_L))) {
opt &= ~GREP_OPT_n; opt &= ~GREP_OPT_n;
lines_before = 0; lines_before = 0;
lines_after = 0; lines_after = 0;
@ -305,6 +312,7 @@ extern int grep_main(int argc, char **argv)
#endif #endif
print_files_with_matches = opt & GREP_OPT_l; print_files_with_matches = opt & GREP_OPT_l;
print_files_without_matches = (opt & GREP_OPT_L) != 0;
print_line_num = opt & GREP_OPT_n; print_line_num = opt & GREP_OPT_n;
be_quiet = opt & GREP_OPT_q; be_quiet = opt & GREP_OPT_q;
invert_search = (opt & GREP_OPT_v) != 0; /* 0 | 1 */ invert_search = (opt & GREP_OPT_v) != 0; /* 0 | 1 */