Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / uniq.c

diff --git a/uniq.c b/uniq.c
index 0324856fd97ac360404a5b00591480a816ae7451..64acf046ad0088fe7a73a495f113e74de69fc947 100644 (file)
--- a/uniq.c
+++ b/uniq.c
@@ -28,9 +28,12 @@
 #include <errno.h>
 
 static const char uniq_usage[] =
-       "uniq [OPTION]... [INPUT [OUTPUT]]\n\n"
-       "Discard all but one of successive identical lines from INPUT\n"
-       "(or standard input), writing to OUTPUT (or standard output).\n";
+       "uniq [OPTION]... [INPUT [OUTPUT]]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nDiscard all but one of successive identical lines from INPUT\n"
+       "(or standard input), writing to OUTPUT (or standard output).\n"
+#endif
+       ;
 
 /* max chars in line */
 #define UNIQ_MAX 4096
@@ -181,7 +184,7 @@ int uniq_main(int argc, char **argv)
        subject_last(&s);
        subject_study(&s);
 
-       exit(0);
+       return(0);
 }
 
-/* $Id: uniq.c,v 1.9 2000/04/17 16:16:10 erik Exp $ */
+/* $Id: uniq.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */