emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uniq: code shrink

Browse Source 
function                                             old     new   delta
xgetoptfile_uniq_s                                    44      51      +7
uniq_main                                            389     368     -21
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 7/-21)             Total: -14 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-08-30 19:35:06 +02:00
parent a9c9bf5055
commit 1249dbb2c7
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
coreutils/uniq.c
View File

@ -12,23 +12,23 @@
#include "libbb.h" #include "libbb.h"
static FILE *xgetoptfile_uniq_s(char **argv, int read0write2) static void xgetoptfile_uniq_s(const char *n, int fd)
{ {
const char *n; if (n == NULL)
return;
n = *argv; if ((n[0] == '-') && !n[1])
if (n != NULL) { return;
if ((n[0] != '-') || n[1]) { /* close(fd); - optimization */
return xfopen(n, "r\0w" + read0write2); xmove_fd(
} xopen3(n,
} (fd == STDIN_FILENO) ? O_RDONLY : (O_WRONLY | O_CREAT | O_TRUNC),
return (read0write2) ? stdout : stdin; 0666),
fd);
} }
int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int uniq_main(int argc UNUSED_PARAM, char **argv) int uniq_main(int argc UNUSED_PARAM, char **argv)
{ {
FILE *in, *out;
const char *input_filename; const char *input_filename;
unsigned skip_fields, skip_chars, max_chars; unsigned skip_fields, skip_chars, max_chars;
unsigned opt; unsigned opt;
@ -53,11 +53,11 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
input_filename = *argv; input_filename = *argv;
in = xgetoptfile_uniq_s(argv, 0); xgetoptfile_uniq_s(*argv, STDIN_FILENO);
if (*argv) { if (*argv) {
++argv; ++argv;
} }
out = xgetoptfile_uniq_s(argv, 2); xgetoptfile_uniq_s(*argv, STDOUT_FILENO);
if (*argv && argv[1]) { if (*argv && argv[1]) {
bb_show_usage(); bb_show_usage();
} }
@ -75,7 +75,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
dups = 0; dups = 0;
/* gnu uniq ignores newlines */ /* gnu uniq ignores newlines */
while ((cur_line = xmalloc_fgetline(in)) != NULL) { while ((cur_line = xmalloc_fgetline(stdin)) != NULL) {
cur_compare = cur_line; cur_compare = cur_line;
for (i = skip_fields; i; i--) { for (i = skip_fields; i; i--) {
cur_compare = skip_whitespace(cur_compare); cur_compare = skip_whitespace(cur_compare);
@ -95,14 +95,14 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
if (old_line) { if (old_line) {
if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_u) */ if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_u) */
fprintf(out, "\0%lu " + (opt & 1), dups + 1); /* 1 == OPT_c */ printf("\0%lu " + (opt & 1), dups + 1); /* 1 == OPT_c */
fprintf(out, "%s\n", old_line); printf("%s\n", old_line);
} }
free(old_line); free(old_line);
} }
} while (cur_line); } while (cur_line);
die_if_ferror(in, input_filename); die_if_ferror(stdin, input_filename);
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }