diff options
author | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-07-31 22:41:05 +0000 |
---|---|---|
committer | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-07-31 22:41:05 +0000 |
commit | 89d60ee6f3e200b6052f668bbf036f90741189bf (patch) | |
tree | a57dc204ef744ff6fb88abca452954276b68a248 /findutils/grep.c | |
parent | bc7a361ea606894dd70d7a2b27b5c45994f74bb3 (diff) | |
download | busybox-w32-89d60ee6f3e200b6052f668bbf036f90741189bf.tar.gz busybox-w32-89d60ee6f3e200b6052f668bbf036f90741189bf.tar.bz2 busybox-w32-89d60ee6f3e200b6052f668bbf036f90741189bf.zip |
patch by srowe in Bug 359 to fix fgrep aliasing
git-svn-id: svn://busybox.net/trunk/busybox@11001 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r-- | findutils/grep.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 9b26add9a..a8fd2d41a 100644 --- a/findutils/grep.c +++ b/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; |