diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-07-31 22:41:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-31 22:41:05 +0000 |
commit | 25b8652b4f0122f23fbd1e59961935d9ea5e600e (patch) | |
tree | 08d399af0e8065973f944f2dba99d65bf7f7f151 /busybox/findutils/grep.c | |
parent | 091a3e510e5f9c61c4d9f03bdbc8433847f645a8 (diff) | |
download | busybox-w32-25b8652b4f0122f23fbd1e59961935d9ea5e600e.tar.gz busybox-w32-25b8652b4f0122f23fbd1e59961935d9ea5e600e.tar.bz2 busybox-w32-25b8652b4f0122f23fbd1e59961935d9ea5e600e.zip |
patch by srowe in Bug 359 to fix fgrep aliasing
Diffstat (limited to 'busybox/findutils/grep.c')
-rw-r--r-- | busybox/findutils/grep.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/busybox/findutils/grep.c b/busybox/findutils/grep.c index 9b26add9a..a8fd2d41a 100644 --- a/busybox/findutils/grep.c +++ b/busybox/findutils/grep.c | |||
@@ -326,6 +326,11 @@ extern int grep_main(int argc, char **argv) | |||
326 | if(opt & GREP_OPT_f) | 326 | if(opt & GREP_OPT_f) |
327 | load_regexes_from_file(fopt); | 327 | load_regexes_from_file(fopt); |
328 | 328 | ||
329 | #ifdef CONFIG_FEATURE_GREP_FGREP_ALIAS | ||
330 | if(bb_applet_name[0] == 'f') | ||
331 | fgrep_flag = 1; | ||
332 | #endif | ||
333 | |||
329 | #ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS | 334 | #ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS |
330 | if(bb_applet_name[0] == 'e' || (opt & GREP_OPT_E)) | 335 | if(bb_applet_name[0] == 'e' || (opt & GREP_OPT_E)) |
331 | reflags = REG_EXTENDED | REG_NOSUB; | 336 | reflags = REG_EXTENDED | REG_NOSUB; |