more thorough fix for systems with strange socklen_t

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

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index be53b312e2186197edbedb65d39c2cf3c2489af6..e566dc1bc8292619b0c8cb537a6e9ae69e5ef98b 100644 (file)
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -12,23 +12,9 @@
 
 #include "libbb.h"
 
-static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
-{
-       const char *n;
-
-       n = *argv;
-       if (n != NULL) {
-               if ((n[0] != '-') || n[1]) {
-                       return xfopen(n, "r\0w" + read0write2);
-               }
-       }
-       return (read0write2) ? stdout : stdin;
-}
-
 int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uniq_main(int argc UNUSED_PARAM, char **argv)
 {
-       FILE *in, *out;
        const char *input_filename;
        unsigned skip_fields, skip_chars, max_chars;
        unsigned opt;
@@ -51,15 +37,25 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
        opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
        argv += optind;
 
-       input_filename = *argv;
+       input_filename = argv[0];
+       if (input_filename) {
+               const char *output;
 
-       in = xgetoptfile_uniq_s(argv, 0);
-       if (*argv) {
-               ++argv;
-       }
-       out = xgetoptfile_uniq_s(argv, 2);
-       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);
+                               //xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+                               xmove_fd(xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);
+                       }
+               }
        }
 
        cur_compare = cur_line = NULL; /* prime the pump */
@@ -75,7 +71,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                dups = 0;
 
                /* gnu uniq ignores newlines */
-               while ((cur_line = xmalloc_fgetline(in)) != NULL) {
+               while ((cur_line = xmalloc_fgetline(stdin)) != NULL) {
                        cur_compare = cur_line;
                        for (i = skip_fields; i; i--) {
                                cur_compare = skip_whitespace(cur_compare);
@@ -95,14 +91,17 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
 
                if (old_line) {
                        if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_u) */
-                               fprintf(out, "\0%lu " + (opt & 1), dups + 1); /* 1 == OPT_c */
-                               fprintf(out, "%s\n", old_line);
+                               if (opt & OPT_c) {
+                                       /* %7lu matches GNU coreutils 6.9 */
+                                       printf("%7lu ", dups + 1);
+                               }
+                               printf("%s\n", old_line);
                        }
                        free(old_line);
                }
        } while (cur_line);
 
-       die_if_ferror(in, input_filename);
+       die_if_ferror(stdin, input_filename);
 
        fflush_stdout_and_exit(EXIT_SUCCESS);
 }