Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/uniq.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/uniq.c (modified) (6 diffs)

branches/2.2.5/mindi-busybox/coreutils/uniq.c

@@ -11 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include "busybox.h"
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
+#include "libbb.h"
 
-static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4";
+static const char uniq_opts[] ALIGN1 = "cdu" "f:s:" "cdu\0\1\2\4";
 
 static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
@@ -22 +19 @@
     const char *n;
 
-    if ((n = *argv) != NULL) {
+    n = *argv;
+    if (n != NULL) {
         if ((*n != '-') || n[1]) {
-            return bb_xfopen(n, "r\0w" + read0write2);
+            return xfopen(n, "r\0w" + read0write2);
         }
     }
@@ -30 +28 @@
 }
 
+int uniq_main(int argc, char **argv);
 int uniq_main(int argc, char **argv)
 {
     FILE *in, *out;
-    unsigned long dups, skip_fields, skip_chars, i, uniq_flags;
+    unsigned long dups, skip_fields, skip_chars, i;
     const char *s0, *e0, *s1, *e1, *input_filename;
-    int opt;
+    unsigned opt;
 
-    uniq_flags = skip_fields = skip_chars = 0;
+    enum {
+        OPT_c = 0x1,
+        OPT_d = 0x2,
+        OPT_u = 0x4,
+        OPT_f = 0x8,
+        OPT_s = 0x10,
+    };
 
-    while ((opt = getopt(argc, argv, uniq_opts)) > 0) {
-        if ((opt == 'f') || (opt == 's')) {
-            int t = bb_xgetularg10(optarg);
-            if (opt == 'f') {
-                skip_fields = t;
-            } else {
-                skip_chars = t;
-            }
-        } else if ((s0 = strchr(uniq_opts, opt)) != NULL) {
-            uniq_flags |= s0[4];
-        } else {
-            bb_show_usage();
-        }
-    }
+    skip_fields = skip_chars = 0;
 
-    input_filename = *(argv += optind);
+    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;
 
     in = xgetoptfile_uniq_s(argv, 0);
@@ -73 +72 @@
 
         /* gnu uniq ignores newlines */
-        while ((s1 = bb_get_chomped_line_from_file(in)) != NULL) {
+        while ((s1 = xmalloc_getline(in)) != NULL) {
             e1 = s1;
-            for (i=skip_fields ; i ; i--) {
+            for (i = skip_fields; i; i--) {
                 e1 = skip_whitespace(e1);
-                while (*e1 && !isspace(*e1)) {
-                    ++e1;
-                }
+                e1 = skip_non_whitespace(e1);
             }
-            for (i = skip_chars ; *e1 && i ; i--) {
+            for (i = skip_chars; *e1 && i; i--) {
                 ++e1;
             }
@@ -93 +90 @@
 
         if (s0) {
-            if (!(uniq_flags & (2 << !!dups))) {
-                bb_fprintf(out, "\0%d " + (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);
@@ -101 +98 @@
     } while (s1);
 
-    bb_xferror(in, input_filename);
+    die_if_ferror(in, input_filename);
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }