X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Funiq.c;h=126eaeef99dd672d243bfab68ce86fd993c79da0;hb=ae05dd42ca809d81f7025d29701d4641f1a996bf;hp=312653263badc97d3625d9bdee3247f26601292b;hpb=1283a150aeaff9e563223981a54f7bdf1592743f;p=oweals%2Fbusybox.git

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 312653263..126eaeef9 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -2,97 +2,101 @@
 /*
  * 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[] = "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) MAIN_EXTERNALLY_VISIBLE;
+int uniq_main(int argc UNUSED_PARAM, char **argv)
 {
 	FILE *in, *out;
-	unsigned long dups, skip_fields, skip_chars, i;
-	const char *oldline, *oldskipped, *line, *skipped, *input_filename;
-	int opt;
-	int uniq_flags = 6;		/* -u */
+	const char *s0, *e0, *s1, *e1, *input_filename;
+	unsigned long dups;
+	unsigned skip_fields, skip_chars, max_chars;
+	unsigned opt;
+	unsigned i;
+
+	enum {
+		OPT_c = 0x1,
+		OPT_d = 0x2,
+		OPT_u = 0x4,
+		OPT_f = 0x8,
+		OPT_s = 0x10,
+		OPT_w = 0x20,
+	};
 
 	skip_fields = skip_chars = 0;
+	max_chars = INT_MAX;
 
-	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 ((line = strchr(uniq_opts, opt)) != NULL) {
-			uniq_flags &= line[4];
-			uniq_flags |= line[7];
-		} else bb_show_usage();
-	}
+	opt_complementary = "f+:s+:w+";
+	opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
+	argv += optind;
+
+	input_filename = *argv;
 
-	input_filename = *(argv += optind);
+	in = xgetoptfile_uniq_s(argv, 0);
+	if (*argv) {
+		++argv;
+	}
+	out = xgetoptfile_uniq_s(argv, 2);
+	if (*argv && argv[1]) {
+		bb_show_usage();
+	}
 
-	in = xgetoptfile_sort_uniq(argv, "r");
-	if (*argv) ++argv;
-	out = xgetoptfile_sort_uniq(argv, "w");
-	if (*argv && argv[1]) bb_show_usage();
+	s1 = e1 = NULL; /* prime the pump */
 
-	oldline = NULL;
+	do {
+		s0 = s1;
+		e0 = e1;
+		dups = 0;
 
-	/* gnu uniq ignores newlines */
-	while ((line = bb_get_chomped_line_from_file(in)) != NULL) {
-		skipped = line;
-		for (i=skip_fields ; i ; i--) {
-			skipped = bb_skip_whitespace(skipped);
-			while (*skipped && !isspace(*skipped)) ++skipped;
-		}
-		for (i = skip_chars ; *skipped && i ; i--) ++skipped;
-		if (oldline) {
-			if (strcmp(oldskipped, skipped) == 0) {
-				++dups;		/* Note: Testing for overflow seems excessive. */
-				continue;
+		/* gnu uniq ignores newlines */
+		while ((s1 = xmalloc_fgetline(in)) != NULL) {
+			e1 = s1;
+			for (i = skip_fields; i; i--) {
+				e1 = skip_whitespace(e1);
+				e1 = skip_non_whitespace(e1);
 			}
-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", oldline);
+			for (i = skip_chars; *e1 && i; i--) {
+				++e1;
 			}
-			free((void *)oldline);
-		}
 
-		oldline = line;
-		oldskipped = skipped;
-		dups = 0;
-	}
+			if (!s0 || strncmp(e0, e1, max_chars)) {
+				break;
+			}
 
-	if (oldline) {
-		skipped = NULL;
-		goto DO_LAST;
-	}
+			++dups;	 /* note: 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);
+			}
+			free((void *)s0);
+		}
+	} 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);
 }