15ca58648
Mike Frysinger
2005-07-31
Subject
patch by srowe in Bug 359 to fix fgrep aliasing
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
findutils/Config.in+3 -3
| @@ -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)" | |
findutils/grep.c+5 -0
| @@ -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; | |