X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Funiq.c;h=e566dc1bc8292619b0c8cb537a6e9ae69e5ef98b;hb=bb1dcc9aab5f517d963b601289aa75508d6e088e;hp=7e78be390fea5adc12870cf4659dcf68ff09f99c;hpb=abb4772b2821ac113f4748e376ea35770ecaae08;p=oweals%2Fbusybox.git diff --git a/coreutils/uniq.c b/coreutils/uniq.c index 7e78be390..e566dc1bc 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -1,157 +1,107 @@ +/* vi: set sw=4 ts=4: */ /* - * Mini sort implementation for busybox + * uniq implementation for busybox * + * Copyright (C) 2005 Manuel Novoa III * - * Copyright (C) 1999 by Lineo, inc. - * Written by John Beppu - * - * 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 - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ -#include "internal.h" -#include - -static const char uniq_usage[] = -"haha\n" -; - -/* max chars in line */ -#define UNIQ_MAX 4096 - -typedef void (Print)(FILE *, const char *); +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */ -typedef int (Decide)(const char *, const char *); +#include "libbb.h" -/* 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) +int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int uniq_main(int argc UNUSED_PARAM, char **argv) { - /* 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) -{ - 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; -} - -/* 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 i; - char opt; - FILE *in, *out; - Subject s; - - /* init */ - in = stdin; - out = stdout; - - subject_init(&s, in, out, NULL); - while (subject_next(&s)) { - subject_study(&s); - } - subject_last(&s); - subject_study(&s); - exit(0); - - /* XXX : finish the tedious stuff */ - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'h': - usage(uniq_usage); - default: - usage(uniq_usage); - } - } else { - break; + const char *input_filename; + unsigned skip_fields, skip_chars, max_chars; + unsigned opt; + char *cur_line; + const char *cur_compare; + + enum { + OPT_c = 0x1, + 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 = INT_MAX; + + opt_complementary = "f+:s+:w+"; + opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars); + argv += optind; + + 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); + } + } } - } - exit(0); + cur_compare = cur_line = NULL; /* prime the pump */ + + do { + 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 ((cur_line = xmalloc_fgetline(stdin)) != NULL) { + cur_compare = cur_line; + for (i = skip_fields; i; i--) { + cur_compare = skip_whitespace(cur_compare); + cur_compare = skip_non_whitespace(cur_compare); + } + for (i = skip_chars; *cur_compare && i; i--) { + ++cur_compare; + } + + if (!old_line || strncmp(old_compare, cur_compare, max_chars)) { + break; + } + + free(cur_line); + ++dups; /* testing for overflow seems excessive */ + } + + 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(old_line); + } + } while (cur_line); + + die_if_ferror(stdin, input_filename); + + fflush_stdout_and_exit(EXIT_SUCCESS); } - -/* $Id: uniq.c,v 1.1 2000/01/06 00:48:21 beppu Exp $ */