[BusyBox] Bug? in grep with context

[Christophe Boyanique]

Hi all,

Here is a strange behaviour while using grep applet with GREP_CONTEXT
enabled:

while calling grep without A, B , C options the applet displays the "--"
separator lines between each occurence which is not the behaviour of gnu
grep (see examples below)...

I have attached a one-line patch to correct this...

Christophe.


[margarita busybox]$ grep main busybox.c
int main(int argc, char **argv)
int busybox_main(int argc, char **argv)
        return (main(argc, argv));


[margarita busybox]$ ./busybox grep main busybox.c
int main(int argc, char **argv)
--
int busybox_main(int argc, char **argv)
--
        return (main(argc, argv));


[margarita busybox]$ grep -C1 main busybox.c

int main(int argc, char **argv)
{
--

int busybox_main(int argc, char **argv)
{
--

        return (main(argc, argv));
}


[ipanema at margarita busybox]$ grep -C1 main busybox.c

int main(int argc, char **argv)
{
--

int busybox_main(int argc, char **argv)
{
--

        return (main(argc, argv));
}
-------------- next part --------------
diff -urP busybox.orig/Changelog busybox/Changelog
--- busybox.orig/Changelog	Mon Apr 16 17:46:44 2001
+++ busybox/Changelog	Tue May 22 13:53:33 2001
@@ -1,6 +1,8 @@
 0.52
 	
 	* Sterling Huxley -- Several bugfixes for the vi applet.
+	* Christophe Boyanique - Added the DATE_FORMAT_HELP feature
+	    to provide help with valid date formats.
 
 
 	 -Erik Andersen, not yet released
diff -urP busybox.orig/Config.h busybox/Config.h
--- busybox.orig/Config.h	Mon May 21 22:30:51 2001
+++ busybox/Config.h	Tue May 22 13:44:39 2001
@@ -174,6 +174,11 @@
 // calculate terminal & column widths (for more and ls)
 #define BB_FEATURE_AUTOWIDTH
 //
+// Allow extensive format help on the date applet:
+#if defined BB_FEATURE_VERBOSE_USAGE
+#define BB_FEATURE_DATE_FORMAT_HELP
+#endif
+//
 // show username/groupnames for ls
 #define BB_FEATURE_LS_USERNAME
 //
diff -urP busybox.orig/usage.h busybox/usage.h
--- busybox.orig/usage.h	Mon May 21 22:30:51 2001
+++ busybox/usage.h	Tue May 22 13:44:39 2001
@@ -147,6 +147,11 @@
 	"$ echo "Hello world" | cut -f 2 -d ' '\n" \
 	"world\n"
 
+#ifdef BB_FEATURE_DATE_FORMAT_HELP
+  #define USAGE_DATE_FORMAT_HELP(a) a
+#else
+  #define USAGE_DATE_FORMAT_HELP(a)
+#endif
 #define date_trivial_usage \
 	"[OPTION]... [+FORMAT]"
 #define date_full_usage \
@@ -155,7 +160,15 @@
 	"\t-R\t\tOutputs RFC-822 compliant date string\n" \
 	"\t-d STRING\tdisplay time described by STRING, not `now'\n" \
 	"\t-s\t\tSets time described by STRING\n" \
-	"\t-u\t\tPrints or sets Coordinated Universal Time"
+	"\t-u\t\tPrints or sets Coordinated Universal Time" \
+	USAGE_DATE_FORMAT_HELP("\n\nValid FORMAT strings:\n" \
+	"\tmmddHHMM[YY]YY\n" \
+	"\tHH:MM\n" \
+	"\tHH:MM:SS\n" \
+	"\tmm.dd-HH:MM\n" \
+	"\tmm.dd-HH:MM:SS\n" \
+	"\tYYYY.mm.dd-HH:MM\n" \
+	"\tYYYY.mm.dd-HH:MM:SS")
 #define date_example_usage \
 	"$ date\n" \
 	"Wed Apr 12 18:52:41 MDT 2000\n"