aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2001-03-14 17:45:45 +0000
committerMark Whitley <markw@lineo.com>2001-03-14 17:45:45 +0000
commit40e5e7c7eaab7c0806acf6cc8a51c8b15c7e0b1b (patch)
treed843aa04ede661255b69f62e6a5a775a4b2cea2f
parent20f61d35de081067ce2e31c58c80cd30070ee876 (diff)
downloadbusybox-40e5e7c7eaab7c0806acf6cc8a51c8b15c7e0b1b.tar.gz
Applied patch from Christophe Boyanique to add an egrep alias for grep.
-rw-r--r--Config.h3
-rw-r--r--applets.h3
-rw-r--r--applets/usage.h3
-rw-r--r--include/applets.h3
-rw-r--r--include/usage.h3
-rw-r--r--usage.h3
6 files changed, 18 insertions, 0 deletions
diff --git a/Config.h b/Config.h
index 13d7f0c4d..bf07525b6 100644
--- 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 b3fb291d7..f85f45720 100644
--- 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 f316018c8..b60f1f911 100644
--- 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 b3fb291d7..f85f45720 100644
--- 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 f316018c8..b60f1f911 100644
--- 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 f316018c8..b60f1f911 100644
--- 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 \