patch by srowe in Bug 359 to fix fgrep aliasing

diff --git a/busybox/findutils/Config.in b/busybox/findutils/Config.in
index 3143bd438cde1bb0c4c121766f60db13ab144131..10dc72e299c029398a99228bb98cc914b8b0a2fd 100644 (file)
--- a/busybox/findutils/Config.in
+++ b/busybox/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/busybox/findutils/grep.c b/busybox/findutils/grep.c
index 9b26add9a465df6aa19caa7a7fe2f4a0f1873984..a8fd2d41abb59e7394a38c888e88386b3ffd294a 100644 (file)
--- a/busybox/findutils/grep.c
+++ b/busybox/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;