ntpd: default to FEATURE_NTP_AUTH=y

[oweals/busybox.git] / coreutils / uniq.c

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 910f46e15c906310c23a65b5f643316bd334c5e5..f71557b675081f1843eabcfbd814bf4928653c2e 100644 (file)
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -4,27 +4,40 @@
  *
  * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config UNIQ
+//config:      bool "uniq (4.8 kb)"
+//config:      default y
+//config:      help
+//config:      uniq is used to remove duplicate lines from a sorted file.
+
+//applet:IF_UNIQ(APPLET(uniq, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_UNIQ) += uniq.o
 
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include "libbb.h"
+//usage:#define uniq_trivial_usage
+//usage:       "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
+//usage:#define uniq_full_usage "\n\n"
+//usage:       "Discard duplicate lines\n"
+//usage:     "\n       -c      Prefix lines by the number of occurrences"
+//usage:     "\n       -d      Only print duplicate lines"
+//usage:     "\n       -u      Only print unique lines"
+//usage:     "\n       -i      Ignore case"
+//usage:     "\n       -f N    Skip first N fields"
+//usage:     "\n       -s N    Skip first N chars (after any skipped fields)"
+//usage:     "\n       -w N    Compare N characters in line"
+//usage:
+//usage:#define uniq_example_usage
+//usage:       "$ echo -e \"a\\na\\nb\\nc\\nc\\na\" | sort | uniq\n"
+//usage:       "a\n"
+//usage:       "b\n"
+//usage:       "c\n"
 
-static void xgetoptfile_uniq_s(const char *n, int fd)
-{
-       if (n == NULL)
-               return;
-       if ((n[0] == '-') && !n[1])
-               return;
-       /* close(fd); - optimization */
-       xmove_fd(
-               xopen3(n,
-                       (fd == STDIN_FILENO) ? O_RDONLY : (O_WRONLY | O_CREAT | O_TRUNC),
-                       0666),
-               fd);
-}
+#include "libbb.h"
 
 int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uniq_main(int argc UNUSED_PARAM, char **argv)
@@ -42,24 +55,34 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                OPT_f = 0x8,
                OPT_s = 0x10,
                OPT_w = 0x20,
+               OPT_i = 0x40,
        };
 
        skip_fields = skip_chars = 0;
        max_chars = INT_MAX;
 
-       opt_complementary = "f+:s+:w+";
-       opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
+       opt = getopt32(argv, "cduf:+s:+w:+i", &skip_fields, &skip_chars, &max_chars);
        argv += optind;
 
-       input_filename = *argv;
+       input_filename = argv[0];
+       if (input_filename) {
+               const char *output;
 
-       xgetoptfile_uniq_s(*argv, STDIN_FILENO);
-       if (*argv) {
-               ++argv;
-       }
-       xgetoptfile_uniq_s(*argv, STDOUT_FILENO);
-       if (*argv && argv[1]) {
-               bb_show_usage();
+               if (input_filename[0] != '-' || input_filename[1]) {
+                       close(STDIN_FILENO); /* == 0 */
+                       xopen(input_filename, O_RDONLY); /* fd will be 0 */
+               }
+               output = argv[1];
+               if (output) {
+                       if (argv[2])
+                               bb_show_usage();
+                       if (output[0] != '-' || output[1]) {
+                               // Won't work with "uniq - FILE" and closed stdin:
+                               //close(STDOUT_FILENO);
+                               //xopen(output, O_WRONLY | O_CREAT | O_TRUNC);
+                               xmove_fd(xopen(output, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
+                       }
+               }
        }
 
        cur_compare = cur_line = NULL; /* prime the pump */
@@ -85,18 +108,26 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                                ++cur_compare;
                        }
 
-                       if (!old_line || strncmp(old_compare, cur_compare, max_chars)) {
+                       if (!old_line)
+                               break;
+                       if ((opt & OPT_i)
+                               ? strncasecmp(old_compare, cur_compare, max_chars)
+                               : strncmp(old_compare, cur_compare, max_chars)
+                       ) {
                                break;
                        }
 
                        free(cur_line);
-                       ++dups;  /* testing for overflow seems excessive */
+                       ++dups;  /* testing for overflow seems excessive */
                }
 
                if (old_line) {
                        if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_u) */
-                               printf("\0%lu " + (opt & 1), dups + 1); /* 1 == OPT_c */
-                               printf("%s\n", old_line);
+                               if (opt & OPT_c) {
+                                       /* %7lu matches GNU coreutils 6.9 */
+                                       printf("%7lu ", dups + 1);
+                               }
+                               puts(old_line);
                        }
                        free(old_line);
                }