It turns out that my bug-report was incorrect; busybox-cvs *does*
support grep -E and grep -F; it just doesn't list them in --help.

The included patch modifies the helptext to list -E and -F.


Regards: David Weinehall

--- busybox-cvs-20040623/include/usage.h.old    2005-05-01 19:10:49.000000000 
+0300
+++ busybox-cvs-20040623/include/usage.h        2005-05-01 19:16:36.000000000 
+0300
@@ -785,9 +785,12 @@
 
 #define grep_trivial_usage \
        "[-ihHnqvs] PATTERN [FILEs...]"
+#ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS
 #define grep_full_usage \
        "Search for PATTERN in each FILE or standard input.\n\n" \
        "Options:\n" \
+       "\t-E\tPATTERN is an extended regular expression\n" \
+       "\t-F\tPATTERN is a set of newline-separated strings\n" \
        "\t-H\tprefix output lines with filename where match was found\n" \
        "\t-h\tsuppress the prefixing filename on output\n" \
        "\t-i\tignore case distinctions\n" \
@@ -796,6 +799,20 @@
        "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n" \
        "\t-v\tselect non-matching lines\n" \
        "\t-s\tsuppress file open/read error messages"
+#else
+#define grep_full_usage \
+       "Search for PATTERN in each FILE or standard input.\n\n" \
+       "Options:\n" \
+       "\t-F\tPATTERN is a set of newline-separated strings\n" \
+       "\t-H\tprefix output lines with filename where match was found\n" \
+       "\t-h\tsuppress the prefixing filename on output\n" \
+       "\t-i\tignore case distinctions\n" \
+       "\t-l\tlist names of files that match\n" \
+       "\t-n\tprint line number with output lines\n" \
+       "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n" \
+       "\t-v\tselect non-matching lines\n" \
+       "\t-s\tsuppress file open/read error messages"
+#endif
 #define grep_example_usage \
        "$ grep root /etc/passwd\n" \
        "root:x:0:0:root:/root:/bin/bash\n" \


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to