Applied patch from Christophe Boyanique to add an egrep alias for grep.

diff --git a/Config.h b/Config.h
index 13d7f0c4d938c0c91be8a51a731e6c51f0cf3b74..bf07525b6a8ecebc2cab274b431c629203cbc846 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -329,6 +329,9 @@
 // Support for the -A -B and -C context flags in grep
 //#define BB_FEATURE_GREP_CONTEXT
 //
+// Support for the EGREP applet (alias to the grep applet)
+//#define BB_FEATURE_GREP_EGREP_ALIAS
+//
 // Tell tftp what commands that should be supported.
 #define BB_FEATURE_TFTP_PUT
 #define BB_FEATURE_TFTP_GET

diff --git a/applets.h b/applets.h
index b3fb291d7671857190b1e1ae82d70ca8af148b94..f85f4572087fc7deae730ee2c3d9f40dc64b2726 100644 (file)
--- a/applets.h
+++ b/applets.h
@@ -125,6 +125,9 @@
 #ifdef BB_ECHO
        APPLET(echo, echo_main, _BB_DIR_BIN)
 #endif
+#if defined(BB_FEATURE_GREP_EGREP_ALIAS) && defined(BB_GREP)
+       APPLET(egrep, grep_main, _BB_DIR_BIN)
+#endif
 #ifdef BB_EXPR
        APPLET(expr, expr_main, _BB_DIR_USR_BIN)
 #endif

diff --git a/applets/usage.h b/applets/usage.h
index f316018c847f3ff4a42c685689dd21a3c829f851..b60f1f911c94495d6702e1bac6994d9d720b8e48 100644 (file)
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -344,6 +344,9 @@
        "\t-v\tselect non-matching lines\n" \
        "\t-s\tsuppress file open/read error messages"
 
+#define egrep_trivial_usage grep_trivial_usage
+#define egrep_full_usage grep_full_usage
+
 #define gunzip_trivial_usage \
        "[OPTION]... FILE"
 #define gunzip_full_usage \

diff --git a/include/applets.h b/include/applets.h
index b3fb291d7671857190b1e1ae82d70ca8af148b94..f85f4572087fc7deae730ee2c3d9f40dc64b2726 100644 (file)
--- a/include/applets.h
+++ b/include/applets.h
@@ -125,6 +125,9 @@
 #ifdef BB_ECHO
        APPLET(echo, echo_main, _BB_DIR_BIN)
 #endif
+#if defined(BB_FEATURE_GREP_EGREP_ALIAS) && defined(BB_GREP)
+       APPLET(egrep, grep_main, _BB_DIR_BIN)
+#endif
 #ifdef BB_EXPR
        APPLET(expr, expr_main, _BB_DIR_USR_BIN)
 #endif

diff --git a/include/usage.h b/include/usage.h
index f316018c847f3ff4a42c685689dd21a3c829f851..b60f1f911c94495d6702e1bac6994d9d720b8e48 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -344,6 +344,9 @@
        "\t-v\tselect non-matching lines\n" \
        "\t-s\tsuppress file open/read error messages"
 
+#define egrep_trivial_usage grep_trivial_usage
+#define egrep_full_usage grep_full_usage
+
 #define gunzip_trivial_usage \
        "[OPTION]... FILE"
 #define gunzip_full_usage \

diff --git a/usage.h b/usage.h
index f316018c847f3ff4a42c685689dd21a3c829f851..b60f1f911c94495d6702e1bac6994d9d720b8e48 100644 (file)
--- a/usage.h
+++ b/usage.h
@@ -344,6 +344,9 @@
        "\t-v\tselect non-matching lines\n" \
        "\t-s\tsuppress file open/read error messages"
 
+#define egrep_trivial_usage grep_trivial_usage
+#define egrep_full_usage grep_full_usage
+
 #define gunzip_trivial_usage \
        "[OPTION]... FILE"
 #define gunzip_full_usage \