--- trunk/mkinitrd-magellan/busybox/coreutils/uniq.c	2010/04/29 20:38:48	983
+++ trunk/mkinitrd-magellan/busybox/coreutils/uniq.c	2010/05/30 11:32:42	984
@@ -12,91 +12,96 @@
 
 #include "libbb.h"
 
-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) MAIN_EXTERNALLY_VISIBLE;
 int uniq_main(int argc UNUSED_PARAM, char **argv)
 {
-	FILE *in, *out;
-	const char *s0, *e0, *s1, *e1, *input_filename;
-	unsigned long dups;
+	const char *input_filename;
 	unsigned skip_fields, skip_chars, max_chars;
 	unsigned opt;
-	unsigned i;
+	char *cur_line;
+	const char *cur_compare;
 
 	enum {
 		OPT_c = 0x1,
-		OPT_d = 0x2,
-		OPT_u = 0x4,
+		OPT_d = 0x2, /* print only dups */
+		OPT_u = 0x4, /* print only uniq */
 		OPT_f = 0x8,
 		OPT_s = 0x10,
 		OPT_w = 0x20,
 	};
 
 	skip_fields = skip_chars = 0;
-	max_chars = -1;
+	max_chars = INT_MAX;
 
 	opt_complementary = "f+:s+:w+";
 	opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
 	argv += optind;
 
-	input_filename = *argv;
-
-	in = xgetoptfile_uniq_s(argv, 0);
-	if (*argv) {
-		++argv;
-	}
-	out = xgetoptfile_uniq_s(argv, 2);
-	if (*argv && argv[1]) {
-		bb_show_usage();
+	input_filename = argv[0];
+	if (input_filename) {
+		const char *output;
+
+		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);
+			}
+		}
 	}
 
-	s1 = e1 = NULL; /* prime the pump */
+	cur_compare = cur_line = NULL; /* prime the pump */
 
 	do {
-		s0 = s1;
-		e0 = e1;
+		unsigned i;
+		unsigned long dups;
+		char *old_line;
+		const char *old_compare;
+
+		old_line = cur_line;
+		old_compare = cur_compare;
 		dups = 0;
 
 		/* gnu uniq ignores newlines */
-		while ((s1 = xmalloc_fgetline(in)) != NULL) {
-			e1 = s1;
+		while ((cur_line = xmalloc_fgetline(stdin)) != NULL) {
+			cur_compare = cur_line;
 			for (i = skip_fields; i; i--) {
-				e1 = skip_whitespace(e1);
-				e1 = skip_non_whitespace(e1);
+				cur_compare = skip_whitespace(cur_compare);
+				cur_compare = skip_non_whitespace(cur_compare);
 			}
-			for (i = skip_chars; *e1 && i; i--) {
-				++e1;
+			for (i = skip_chars; *cur_compare && i; i--) {
+				++cur_compare;
 			}
 
-			if (!s0 || strncmp(e0, e1, max_chars)) {
+			if (!old_line || strncmp(old_compare, cur_compare, max_chars)) {
 				break;
 			}
 
-			++dups;	 /* note: testing for overflow seems excessive. */
+			free(cur_line);
+			++dups;	 /* testing for overflow seems excessive */
 		}
 
-		if (s0) {
-			if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_e) */
-				fprintf(out, "\0%ld " + (opt & 1), dups + 1); /* 1 == OPT_c */
-				fprintf(out, "%s\n", s0);
+		if (old_line) {
+			if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_u) */
+				if (opt & OPT_c) {
+					/* %7lu matches GNU coreutils 6.9 */
+					printf("%7lu ", dups + 1);
+				}
+				printf("%s\n", old_line);
 			}
-			free((void *)s0);
+			free(old_line);
 		}
-	} while (s1);
+	} while (cur_line);
 
-	die_if_ferror(in, input_filename);
+	die_if_ferror(stdin, input_filename);
 
 	fflush_stdout_and_exit(EXIT_SUCCESS);
 }