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 1e41eaacdf9418574b99d621c7a466f05eecb227..64acf046ad0088fe7a73a495f113e74de69fc947 100644 (file)
--- a/uniq.c
+++ b/uniq.c
@@ -3,7 +3,7 @@
  * Mini uniq implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,14 +29,11 @@
 
 static const char uniq_usage[] =
        "uniq [OPTION]... [INPUT [OUTPUT]]\n"
-       "Discard all but one of successive identical lines from INPUT (or\n"
-       "standard input), writing to OUTPUT (or standard output).\n"
-       "\n"
-       "\t-h\tdisplay this help and exit\n"
-
-       "\n"
-       "A field is a run of whitespace, then non-whitespace characters.\n"
-       "Fields are skipped before chars.\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
@@ -187,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.7 2000/02/08 19:58:47 erik Exp $ */
+/* $Id: uniq.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */