mirrors/busybox
0
0
Fork 0
mirror of https://git.busybox.net/busybox.git synced 2024-12-01 09:33:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace-level changes. Replace s0,s1,e0,e1 with real variable names and

Browse Source 
clean up whitespace and curly brackets a bit.  Resulting binary should be
identical.
This commit is contained in:
Rob Landley 2005-09-06 01:57:11 +00:00
parent 9955c45907
commit 1283a150ae
1 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
coreutils/uniq.c
View File

@ -36,74 +36,59 @@ static const char uniq_opts[] = "f:s:cdu\0\7\3\5\1\2\4";
int uniq_main(int argc, char **argv) int uniq_main(int argc, char **argv)
{ {
FILE *in, *out; FILE *in, *out;
/* Note: Ignore the warning about dups and e0 being used uninitialized.
* They will be initialized on the fist pass of the loop (since s0 is NULL). */
#warning The dups and e0 warnings are OK, ignore them
unsigned long dups, skip_fields, skip_chars, i; unsigned long dups, skip_fields, skip_chars, i;
const char *s0, *e0, *s1, *e1, *input_filename; const char *oldline, *oldskipped, *line, *skipped, *input_filename;
int opt; int opt;
int uniq_flags = 6; /* -u */ int uniq_flags = 6; /* -u */
skip_fields = skip_chars = 0; skip_fields = skip_chars = 0;
while ((opt = getopt(argc, argv, uniq_opts)) > 0) { while ((opt = getopt(argc, argv, uniq_opts)) > 0) {
if (opt == 'f') { if (opt == 'f') skip_fields = bb_xgetularg10(optarg);
skip_fields = bb_xgetularg10(optarg); else if (opt == 's') skip_chars = bb_xgetularg10(optarg);
} else if (opt == 's') { else if ((line = strchr(uniq_opts, opt)) != NULL) {
skip_chars = bb_xgetularg10(optarg); uniq_flags &= line[4];
} else if ((s0 = strchr(uniq_opts, opt)) != NULL) { uniq_flags |= line[7];
uniq_flags &= s0[4]; } else bb_show_usage();
uniq_flags |= s0[7];
} else {
bb_show_usage();
}
} }
input_filename = *(argv += optind); input_filename = *(argv += optind);
in = xgetoptfile_sort_uniq(argv, "r"); in = xgetoptfile_sort_uniq(argv, "r");
if (*argv) { if (*argv) ++argv;
++argv;
}
out = xgetoptfile_sort_uniq(argv, "w"); out = xgetoptfile_sort_uniq(argv, "w");
if (*argv && argv[1]) { if (*argv && argv[1]) bb_show_usage();
bb_show_usage();
}
s0 = NULL; oldline = NULL;
/* gnu uniq ignores newlines */ /* gnu uniq ignores newlines */
while ((s1 = bb_get_chomped_line_from_file(in)) != NULL) { while ((line = bb_get_chomped_line_from_file(in)) != NULL) {
e1 = s1; skipped = line;
for (i=skip_fields ; i ; i--) { for (i=skip_fields ; i ; i--) {
e1 = bb_skip_whitespace(e1); skipped = bb_skip_whitespace(skipped);
while (*e1 && !isspace(*e1)) { while (*skipped && !isspace(*skipped)) ++skipped;
++e1;
}
} }
for (i = skip_chars ; *e1 && i ; i--) { for (i = skip_chars ; *skipped && i ; i--) ++skipped;
++e1; if (oldline) {
} if (strcmp(oldskipped, skipped) == 0) {
if (s0) {
if (strcmp(e0, e1) == 0) {
++dups; /* Note: Testing for overflow seems excessive. */ ++dups; /* Note: Testing for overflow seems excessive. */
continue; continue;
} }
DO_LAST: DO_LAST:
if ((dups && (uniq_flags & 2)) || (!dups && (uniq_flags & 4))) { if ((dups && (uniq_flags & 2)) || (!dups && (uniq_flags & 4))) {
bb_fprintf(out, "\0%7d\t" + (uniq_flags & 1), dups + 1); bb_fprintf(out, "\0%7d\t" + (uniq_flags & 1), dups + 1);
bb_fprintf(out, "%s\n", s0); bb_fprintf(out, "%s\n", oldline);
} }
free((void *)s0); free((void *)oldline);
} }
s0 = s1; oldline = line;
e0 = e1; oldskipped = skipped;
dups = 0; dups = 0;
} }
if (s0) { if (oldline) {
e1 = NULL; skipped = NULL;
goto DO_LAST; goto DO_LAST;
} }