cal: remove lone static data variable. -4 bytes. coreutils

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

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 11a731aaa5f9a7e6d3c4d03f610bae848a258084..091862118667df7154a06556fbca6f0ff3d02441 100644 (file)
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -10,9 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include "busybox.h"
-
-static const char uniq_opts[] = "cdu" "f:s:" "cdu\0\1\2\4";
+#include "libbb.h"
 
 static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
 {
@@ -27,13 +25,15 @@ static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
        return (read0write2) ? stdout : stdin;
 }
 
-int uniq_main(int argc, char **argv);
-int uniq_main(int argc, char **argv)
+int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int uniq_main(int argc UNUSED_PARAM, char **argv)
 {
        FILE *in, *out;
-       unsigned long dups, skip_fields, skip_chars, i;
        const char *s0, *e0, *s1, *e1, *input_filename;
+       unsigned long dups;
+       unsigned skip_fields, skip_chars, max_chars;
        unsigned opt;
+       unsigned i;
 
        enum {
                OPT_c = 0x1,
@@ -41,15 +41,14 @@ int uniq_main(int argc, char **argv)
                OPT_u = 0x4,
                OPT_f = 0x8,
                OPT_s = 0x10,
+               OPT_w = 0x20,
        };
 
        skip_fields = skip_chars = 0;
+       max_chars = -1;
 
-       opt = getopt32(argc, argv, "cduf:s:", &s0, &s1);
-       if (opt & OPT_f)
-               skip_fields = xatoul(s0);
-       if (opt & OPT_s)
-               skip_chars = xatoul(s1);
+       opt_complementary = "f+:s+:w+";
+       opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
        argv += optind;
 
        input_filename = *argv;
@@ -63,7 +62,7 @@ int uniq_main(int argc, char **argv)
                bb_show_usage();
        }
 
-       s1 = e1 = NULL;                         /* prime the pump */
+       s1 = e1 = NULL; /* prime the pump */
 
        do {
                s0 = s1;
@@ -71,7 +70,7 @@ int uniq_main(int argc, char **argv)
                dups = 0;
 
                /* gnu uniq ignores newlines */
-               while ((s1 = xmalloc_getline(in)) != NULL) {
+               while ((s1 = xmalloc_fgetline(in)) != NULL) {
                        e1 = s1;
                        for (i = skip_fields; i; i--) {
                                e1 = skip_whitespace(e1);
@@ -81,16 +80,16 @@ int uniq_main(int argc, char **argv)
                                ++e1;
                        }
 
-                       if (!s0 || strcmp(e0, e1)) {
+                       if (!s0 || strncmp(e0, e1, max_chars)) {
                                break;
                        }
 
-                       ++dups;          /* Note: Testing for overflow seems excessive. */
+                       ++dups;  /* note: testing for overflow seems excessive. */
                }
 
                if (s0) {
                        if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_e) */
-                               fprintf(out, "\0%d " + (opt & 1), dups + 1);
+                               fprintf(out, "\0%ld " + (opt & 1), dups + 1); /* 1 == OPT_c */
                                fprintf(out, "%s\n", s0);
                        }
                        free((void *)s0);