delete now unused check_header_gzip.c

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

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 90686c9af48bd9c47bc1c055ba043dfd393ab700..719bbb5e3c673efbcf087085fd1bd265b0528442 100644 (file)
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -2,111 +2,102 @@
 /*
  * uniq implementation for busybox
  *
- * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
  *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "busybox.h"
-#include "libcoreutils/coreutils.h"
+#include "libbb.h"
+
+static const char uniq_opts[] ALIGN1 = "cdu" "f:s:" "cdu\0\1\2\4";
 
-static const char uniq_opts[] = "f:s:cdu\0\7\3\5\1\2\4";
+static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
+{
+       const char *n;
 
+       n = *argv;
+       if (n != NULL) {
+               if ((*n != '-') || n[1]) {
+                       return xfopen(n, "r\0w" + read0write2);
+               }
+       }
+       return (read0write2) ? stdout : stdin;
+}
+
+int uniq_main(int argc, char **argv);
 int uniq_main(int argc, char **argv)
 {
        FILE *in, *out;
-       /* Note: Ignore the warning about dups and e0 possibly being uninitialized.
-        * They will be initialized on the fist pass of the loop (since s0 is NULL). */
        unsigned long dups, skip_fields, skip_chars, i;
        const char *s0, *e0, *s1, *e1, *input_filename;
-       int opt;
-       int uniq_flags = 6;             /* -u */
+       unsigned opt;
+
+       enum {
+               OPT_c = 0x1,
+               OPT_d = 0x2,
+               OPT_u = 0x4,
+               OPT_f = 0x8,
+               OPT_s = 0x10,
+       };
 
        skip_fields = skip_chars = 0;
 
-       while ((opt = getopt(argc, argv, uniq_opts)) > 0) {
-               if (opt == 'f') {
-                       skip_fields = bb_xgetularg10(optarg);
-               } else if (opt == 's') {
-                       skip_chars = bb_xgetularg10(optarg);
-               } else if ((s0 = strchr(uniq_opts, opt)) != NULL) {
-                       uniq_flags &= s0[4];
-                       uniq_flags |= s0[7];
-               } else {
-                       bb_show_usage();
-               }
-       }
+       opt = getopt32(argv, "cduf:s:", &s0, &s1);
+       if (opt & OPT_f)
+               skip_fields = xatoul(s0);
+       if (opt & OPT_s)
+               skip_chars = xatoul(s1);
+       argv += optind;
 
-       input_filename = *(argv += optind);
+       input_filename = *argv;
 
-       in = xgetoptfile_sort_uniq(argv, "r");
+       in = xgetoptfile_uniq_s(argv, 0);
        if (*argv) {
                ++argv;
        }
-       out = xgetoptfile_sort_uniq(argv, "w");
+       out = xgetoptfile_uniq_s(argv, 2);
        if (*argv && argv[1]) {
                bb_show_usage();
        }
 
-       s0 = NULL;
+       s1 = e1 = NULL;                         /* prime the pump */
+
+       do {
+               s0 = s1;
+               e0 = e1;
+               dups = 0;
 
-       /* gnu uniq ignores newlines */
-       while ((s1 = bb_get_chomped_line_from_file(in)) != NULL) {
-               e1 = s1;
-               for (i=skip_fields ; i ; i--) {
-                       e1 = bb_skip_whitespace(e1);
-                       while (*e1 && !isspace(*e1)) {
+               /* gnu uniq ignores newlines */
+               while ((s1 = xmalloc_getline(in)) != NULL) {
+                       e1 = s1;
+                       for (i = skip_fields; i; i--) {
+                               e1 = skip_whitespace(e1);
+                               e1 = skip_non_whitespace(e1);
+                       }
+                       for (i = skip_chars; *e1 && i; i--) {
                                ++e1;
                        }
+
+                       if (!s0 || strcmp(e0, e1)) {
+                               break;
+                       }
+
+                       ++dups;          /* Note: Testing for overflow seems excessive. */
                }
-               for (i = skip_chars ; *e1 && i ; i--) {
-                       ++e1;
-               }
+
                if (s0) {
-                       if (strcmp(e0, e1) == 0) {
-                               ++dups;         /* Note: Testing for overflow seems excessive. */
-                               continue;
-                       }
-               DO_LAST:
-                       if ((dups && (uniq_flags & 2)) || (!dups && (uniq_flags & 4))) {
-                               bb_fprintf(out, "\0%7d\t" + (uniq_flags & 1), dups + 1);
-                               bb_fprintf(out, "%s\n", s0);
+                       if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_e) */
+                               fprintf(out, "\0%d " + (opt & 1), dups + 1);
+                               fprintf(out, "%s\n", s0);
                        }
                        free((void *)s0);
                }
+       } while (s1);
 
-               s0 = s1;
-               e0 = e1;
-               dups = 0;
-       }
-
-       if (s0) {
-               e1 = NULL;
-               goto DO_LAST;
-       }
-
-       bb_xferror(in, input_filename);
+       die_if_ferror(in, input_filename);
 
-       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+       fflush_stdout_and_exit(EXIT_SUCCESS);
 }