X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Funiq.c;h=9208d34ec487040bf3a7c40394f910cfe618367e;hb=eced0c78a54bbecc61f1717d33f64ee7d99804bb;hp=eceff6d4b17bff0faa77d5958c104a5724800663;hpb=0aec9ff6b822116f453effb1867f9811c40ad59b;p=oweals%2Fbusybox.git

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index eceff6d4b..9208d34ec 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -4,31 +4,34 @@
  *
  * 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.
  */
 
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include "libbb.h"
-
-static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
-{
-	const char *n;
+//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	-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"
 
-	n = *argv;
-	if (n != NULL) {
-		if ((n[0] != '-') || n[1]) {
-			return xfopen(n, "r\0w" + read0write2);
-		}
-	}
-	return (read0write2) ? stdout : stdin;
-}
+#include "libbb.h"
 
 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 +54,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);
+				//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 */
@@ -75,7 +88,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);
@@ -89,19 +102,23 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
 				break;
 			}
 
-			++dups;	 /* testing for overflow seems excessive */
+			free(cur_line);
+			++dups;  /* testing for overflow seems excessive */
 		}
 
 		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);
 }