aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2005-07-31 22:41:05 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2005-07-31 22:41:05 +0000
commit15ca58648a84ff30821ead91b47562863f36a7c5 (patch)
treea57dc204ef744ff6fb88abca452954276b68a248 /findutils
parent66c37d1390e3fa566e3e68a09a9fb9a34eb6ded3 (diff)
downloadbusybox-15ca58648a84ff30821ead91b47562863f36a7c5.tar.gz
busybox-15ca58648a84ff30821ead91b47562863f36a7c5.tar.bz2
patch by srowe in Bug 359 to fix fgrep aliasing
Diffstat (limited to 'findutils')
-rw-r--r--findutils/Config.in6
-rw-r--r--findutils/grep.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/findutils/Config.in b/findutils/Config.in
index 3143bd438..10dc72e29 100644
--- a/findutils/Config.in
+++ b/findutils/Config.in
@@ -73,13 +73,13 @@ config CONFIG_FEATURE_GREP_EGREP_ALIAS
and various repetition operators.
config CONFIG_FEATURE_GREP_FGREP_ALIAS
- bool " Alias fgrep to grep -f"
+ bool " Alias fgrep to grep -F"
default y
depends on CONFIG_GREP
help
- fgrep sees the search pattern as a normal string rather than
+ fgrep sees the search pattern as a normal string rather than
regular expressions.
- grep -f is always builtin, this just creates the fgrep alias.
+ grep -F is always builtin, this just creates the fgrep alias.
config CONFIG_FEATURE_GREP_CONTEXT
bool " Enable before and after context flags (-A, -B and -C)"
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)
if(opt & GREP_OPT_f)
load_regexes_from_file(fopt);
+#ifdef CONFIG_FEATURE_GREP_FGREP_ALIAS
+ if(bb_applet_name[0] == 'f')
+ fgrep_flag = 1;
+#endif
+
#ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS
if(bb_applet_name[0] == 'e' || (opt & GREP_OPT_E))
reflags = REG_EXTENDED | REG_NOSUB;