[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox-cvs
Subject:    [BusyBox-cvs] svn commit: branches/busybox_1_00_stable/busybox/fin etc...
From:       vapier () busybox ! net (vapier () busybox ! net)
Date:       2005-07-31 16:41:07
Message-ID: 20050731224106.2EE208652EC () codepoet ! org
[Download RAW message or body]

Author: vapier
Date: 2005-07-31 16:41:05 -0600 (Sun, 31 Jul 2005)
New Revision: 11001

Log:
patch by srowe in Bug 359 to fix fgrep aliasing

Modified:
   branches/busybox_1_00_stable/busybox/findutils/Config.in
   branches/busybox_1_00_stable/busybox/findutils/grep.c
   trunk/busybox/findutils/Config.in
   trunk/busybox/findutils/grep.c


Changeset:
Modified: branches/busybox_1_00_stable/busybox/findutils/Config.in
===================================================================
--- branches/busybox_1_00_stable/busybox/findutils/Config.in	2005-07-31 22:22:20 UTC (rev 11000)
+++ branches/busybox_1_00_stable/busybox/findutils/Config.in	2005-07-31 22:41:05 UTC (rev 11001)
@@ -73,13 +73,13 @@
 	  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)"

Modified: branches/busybox_1_00_stable/busybox/findutils/grep.c
===================================================================
--- branches/busybox_1_00_stable/busybox/findutils/grep.c	2005-07-31 22:22:20 UTC (rev 11000)
+++ branches/busybox_1_00_stable/busybox/findutils/grep.c	2005-07-31 22:41:05 UTC (rev 11001)
@@ -326,6 +326,11 @@
 	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;

Modified: trunk/busybox/findutils/Config.in
===================================================================
--- trunk/busybox/findutils/Config.in	2005-07-31 22:22:20 UTC (rev 11000)
+++ trunk/busybox/findutils/Config.in	2005-07-31 22:41:05 UTC (rev 11001)
@@ -73,13 +73,13 @@
 	  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)"

Modified: trunk/busybox/findutils/grep.c
===================================================================
--- trunk/busybox/findutils/grep.c	2005-07-31 22:22:20 UTC (rev 11000)
+++ trunk/busybox/findutils/grep.c	2005-07-31 22:41:05 UTC (rev 11001)
@@ -326,6 +326,11 @@
 	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;

[prev in list] [next in list] [prev in thread] [next in thread]