X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Funiq.c;h=53e3c64f29c421d48cbc1e8fc7044154b0b8ab5a;hb=ceeff7381929930fe8d7e33543e285d5fdcf1c68;hp=5f0e192a21e51321ff716e4805abf0d1dcc891d6;hpb=96f1f33e560295e0ef290d96ec2ca54a6ebee23e;p=oweals%2Fbusybox.git

diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 5f0e192a2..53e3c64f2 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -1,9 +1,11 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini uniq implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
+ * Rewritten by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * 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
@@ -21,169 +23,67 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <string.h>
+#include <getopt.h>
 #include <errno.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-static const char uniq_usage[] =
-"haha\n"
-;
+static int print_count;
+static int print_uniq = 1;
+static int print_duplicates = 1;
 
-/* max chars in line */
-#define UNIQ_MAX 4096
-
-typedef void (Print)(FILE *, const char *);
-
-typedef int (Decide)(const char *, const char *);
-
-/* container for two lines to be compared */
-typedef struct {
-    char    *a;
-    char    *b;
-    int	    recurrence;
-    FILE    *in;
-    FILE    *out;
-    void    *func;
-} Subject;
-
-/* set up all the variables of a uniq operation */
-static Subject *
-subject_init(Subject *self, FILE *in, FILE *out, void *func)
-{
-    self->a    = NULL;
-    self->b    = NULL;
-    self->in   = in;
-    self->out  = out;
-    self->func = func;
-    self->recurrence = 0;
-    return self;
-}
-
-/* point a and b to the appropriate lines;
- * count the recurrences (if any) of a string;
- */
-static Subject *
-subject_next(Subject *self)
-{
-    /* tmp line holders */
-    static char line[2][UNIQ_MAX];
-    static int  alternator = 0;
-
-    if (fgets(line[alternator], UNIQ_MAX, self->in)) {
-	self->a = self->b;
-	self->b = line[alternator];
-	alternator ^= 1;
-	return self;
-    }
-
-    return NULL;
-}
-
-static Subject *
-subject_last(Subject *self)
-{
-    self->a = self->b;
-    self->b = NULL;
-    return self;
-}
-
-static Subject *
-subject_study(Subject *self)
+static void print_line(char *line, int count, FILE *fp)
 {
-    if (self->a == NULL) {
-	return self;
-    }
-    if (self->b == NULL) {
-	fprintf(self->out, "%s", self->a);
-	return self;
-    }
-    if (strcmp(self->a, self->b) == 0) {
-	self->recurrence++;
-    } else {
-	fprintf(self->out, "%s", self->a);
-	self->recurrence = 0;
-    }
-    return self;
-}
-
-static int
-set_file_pointers(int schema, FILE **in, FILE **out, char **argv)
-{
-    switch (schema) {
-	case 0:
-	    *in = stdin;
-	    *out = stdout;
-	    break;
-	case 1:
-	    *in = fopen(argv[0], "r");
-	    *out = stdout;
-	    break;
-	case 2:
-	    *in = fopen(argv[0], "r");
-	    *out = fopen(argv[1], "w");
-	    break;
-    }
-    if (*in == NULL) {
-	fprintf(stderr, "uniq: %s: %s\n", argv[0], strerror(errno));
-	return errno;
-    }
-    if (*out == NULL) {
-	fprintf(stderr, "uniq: %s: %s\n", argv[1], strerror(errno));
-	return errno;
-    }
-    return 0;
+	if ((print_duplicates && count > 1) || (print_uniq && count == 1)) {
+		if (print_count)
+			fprintf(fp, "%7d\t%s", count, line);
+		else
+			fputs(line, fp);
+	}
 }
 
-
-/* one variable is the decision algo */
-/* another variable is the printing algo */
-
-/* I don't think I have to have more than a 1 line memory 
-   this is the one constant */
-
-/* it seems like GNU/uniq only takes one or two files as an option */
-
-/* ________________________________________________________________________ */
-int
-uniq_main(int argc, char **argv)
+int uniq_main(int argc, char **argv)
 {
-    int	    i;
-    char    opt;
-    FILE    *in, *out;
-    Subject s;
-
-    /* parse argv[] */
-    for (i = 1; i < argc; i++) {
-	if (argv[i][0] == '-') {
-	    opt = argv[i][1];
-	    switch (opt) {
-		case '-':
-		case 'h':
-		    usage(uniq_usage);
-		default:
-		    usage(uniq_usage);
-	    }
-	} else {
-	    break;
+	FILE *in = stdin, *out = stdout;
+	char *lastline = NULL, *input;
+	int opt, count = 0;
+
+	/* parse argv[] */
+	while ((opt = getopt(argc, argv, "cdu")) > 0) {
+		switch (opt) {
+			case 'c':
+				print_count = 1;
+				break;
+			case 'd':
+				print_duplicates = 1;
+				print_uniq = 0;
+				break;
+			case 'u':
+				print_duplicates = 0;
+				print_uniq = 1;
+				break;
+		}
 	}
-    }
 
-    /* 0 src: stdin; dst: stdout */
-    /* 1 src: file;  dst: stdout */
-    /* 2 src: file;  dst: file   */
-    if (set_file_pointers((argc - 1), &in, &out, &argv[i])) {
-	exit(1);
-    }
+	if (argv[optind] != NULL) {
+		in = xfopen(argv[optind], "r");
+		if (argv[optind+1] != NULL)
+			out = xfopen(argv[optind+1], "w");
+	}
 
-    subject_init(&s, in, out, NULL);
-    while (subject_next(&s)) { 
-	subject_study(&s);
-    }
-    subject_last(&s);
-    subject_study(&s);
+	while ((input = get_line_from_file(in)) != NULL) {
+		if (lastline == NULL || strcmp(input, lastline) != 0) {
+			print_line(lastline, count, out);
+			free(lastline);
+			lastline = input;
+			count = 0;
+		}
+		count++;
+	}
+	print_line(lastline, count, out);
+	free(lastline);
 
-    exit(0);
+	return EXIT_SUCCESS;
 }
-
-/* $Id: uniq.c,v 1.3 2000/01/06 23:49:21 beppu Exp $ */