From 62a90cdd7435f09f4bb8673e8b7b213067f9d5cc Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 17 Mar 2008 09:07:36 +0000 Subject: *: shrink by using [f]open_or_warn_stdin where appropriate function old new delta lsattr_main 62 143 +81 open_or_warn_stdin - 36 +36 fclose_if_not_stdin 20 47 +27 xfopen_stdin - 20 +20 tac_main 336 356 +20 cksum_main 249 259 +10 bb_argv_dash - 8 +8 su_main 448 455 +7 cmp_main 630 633 +3 passwd_main 1072 1074 +2 uudecode_main 317 315 -2 text_yank 110 108 -2 handle_incoming_and_exit 2653 2651 -2 flags 5 1 -4 write_leases 235 230 -5 fopen_or_warn_stdin 48 42 -6 fold_main 648 642 -6 static.argv_dash 8 - -8 sum_main 142 128 -14 tail_main 1237 1221 -16 sed_main 711 695 -16 cmp_xfopen_input 17 - -17 bb_cat 113 96 -17 catv_main 328 306 -22 strings_main 457 434 -23 hash_file 298 274 -24 sum_file 353 325 -28 sort_main 904 859 -45 expand_main 736 686 -50 cut_main 1116 1065 -51 md5_sha1_sum_main 549 493 -56 lsattr_args 90 - -90 read_stduu 408 255 -153 ------------------------------------------------------------------------------ (add/remove: 3/3 grow/shrink: 7/20 up/down: 214/-657) Total: -443 bytes text data bss dec hex filename 797417 658 7428 805503 c4a7f busybox_old 796973 658 7428 805059 c48c3 busybox_unstripped --- coreutils/fold.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'coreutils/fold.c') diff --git a/coreutils/fold.c b/coreutils/fold.c index ed484edf0..e2a30d5d4 100644 --- a/coreutils/fold.c +++ b/coreutils/fold.c @@ -12,18 +12,17 @@ #include "libbb.h" -static unsigned long flags; -#define FLAG_COUNT_BYTES 1 -#define FLAG_BREAK_SPACES 2 -#define FLAG_WIDTH 4 +/* Must match getopt32 call */ +#define FLAG_COUNT_BYTES 1 +#define FLAG_BREAK_SPACES 2 +#define FLAG_WIDTH 4 /* Assuming the current column is COLUMN, return the column that printing C will move the cursor to. The first column is 0. */ - static int adjust_column(int column, char c) { - if (!(flags & FLAG_COUNT_BYTES)) { + if (!(option_mask32 & FLAG_COUNT_BYTES)) { if (c == '\b') { if (column > 0) column--; @@ -54,29 +53,27 @@ int fold_main(int argc, char **argv) char const *a = argv[i]; if (*a++ == '-') { - if (*a == '-' && !a[1]) + if (*a == '-' && !a[1]) /* "--" */ break; - if (isdigit(*a)) { + if (isdigit(*a)) argv[i] = xasprintf("-w%s", a); - } } } } - flags = getopt32(argv, "bsw:", &w_opt); - if (flags & FLAG_WIDTH) + getopt32(argv, "bsw:", &w_opt); + if (option_mask32 & FLAG_WIDTH) width = xatoul_range(w_opt, 1, 10000); argv += optind; - if (!*argv) { + if (!*argv) *--argv = (char*)"-"; - } do { FILE *istream = fopen_or_warn_stdin(*argv); int c; int column = 0; /* Screen column where next char will go. */ - int offset_out = 0; /* Index in `line_out' for next char. */ + int offset_out = 0; /* Index in 'line_out' for next char. */ if (istream == NULL) { errs |= EXIT_FAILURE; @@ -102,7 +99,7 @@ int fold_main(int argc, char **argv) /* This character would make the line too long. Print the line plus a newline, and make this character start the next line. */ - if (flags & FLAG_BREAK_SPACES) { + if (option_mask32 & FLAG_BREAK_SPACES) { /* Look for the last blank. */ int logical_end; @@ -144,7 +141,7 @@ int fold_main(int argc, char **argv) fwrite(line_out, sizeof(char), (size_t) offset_out, stdout); } - if (ferror(istream) || fclose_if_not_stdin(istream)) { + if (fclose_if_not_stdin(istream)) { bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */ errs |= EXIT_FAILURE; } -- cgit v1.2.3