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/uudecode.c | 70 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 30 deletions(-) (limited to 'coreutils/uudecode.c') diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 34a22398c..4c619dec5 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c @@ -19,48 +19,57 @@ static void read_stduu(FILE *src_stream, FILE *dst_stream) char *line; while ((line = xmalloc_getline(src_stream)) != NULL) { - int length; - char *line_ptr = line; + int encoded_len, str_len; + char *line_ptr, *dst; if (strcmp(line, "end") == 0) { - return; + return; /* the only non-error exit */ } - length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3; - if (length <= 0) { + line_ptr = line; + while (*line_ptr) { + *line_ptr = (*line_ptr - 0x20) & 0x3f; + line_ptr++; + } + str_len = line_ptr - line; + + encoded_len = line[0] * 4 / 3; + /* Check that line is not too short. (we tolerate + * overly _long_ line to accomodate possible extra '`'). + * Empty line case is also caught here. */ + if (str_len <= encoded_len) { + break; /* go to bb_error_msg_and_die("short file"); */ + } + if (encoded_len <= 0) { /* Ignore the "`\n" line, why is it even in the encode file ? */ + free(line); continue; } - if (length > 60) { + if (encoded_len > 60) { bb_error_msg_and_die("line too long"); } - line_ptr++; - /* Tolerate an overly long line to accomodate a possible exta '`' */ - if (strlen(line_ptr) < (size_t)length) { - bb_error_msg_and_die("short file"); - } - - while (length > 0) { + dst = line; + line_ptr = line + 1; + do { /* Merge four 6 bit chars to three 8 bit chars */ - fputc(((line_ptr[0] - 0x20) & 077) << 2 | ((line_ptr[1] - 0x20) & 077) >> 4, dst_stream); - line_ptr++; - length--; - if (length == 0) { + *dst++ = line_ptr[0] << 2 | line_ptr[1] >> 4; + encoded_len--; + if (encoded_len == 0) { break; } - fputc(((line_ptr[0] - 0x20) & 077) << 4 | ((line_ptr[1] - 0x20) & 077) >> 2, dst_stream); - line_ptr++; - length--; - if (length == 0) { + *dst++ = line_ptr[1] << 4 | line_ptr[2] >> 2; + encoded_len--; + if (encoded_len == 0) { break; } - fputc(((line_ptr[0] - 0x20) & 077) << 6 | ((line_ptr[1] - 0x20) & 077), dst_stream); - line_ptr += 2; - length -= 2; - } + *dst++ = line_ptr[2] << 6 | line_ptr[3]; + line_ptr += 4; + encoded_len -= 2; + } while (encoded_len > 0); + fwrite(line, 1, dst - line, dst_stream); free(line); } bb_error_msg_and_die("short file"); @@ -129,7 +138,7 @@ static void read_base64(FILE *src_stream, FILE *dst_stream) int uudecode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int uudecode_main(int argc ATTRIBUTE_UNUSED, char **argv) { - FILE *src_stream = stdin; + FILE *src_stream; char *outname = NULL; char *line; @@ -137,8 +146,9 @@ int uudecode_main(int argc ATTRIBUTE_UNUSED, char **argv) getopt32(argv, "o:", &outname); argv += optind; - if (argv[0]) - src_stream = xfopen(argv[0], "r"); + if (!*argv) + *--argv = (char*)"-"; + src_stream = xfopen_stdin(*argv); /* Search for the start of the encoding */ while ((line = xmalloc_getline(src_stream)) != NULL) { @@ -159,7 +169,7 @@ int uudecode_main(int argc ATTRIBUTE_UNUSED, char **argv) } /* begin line found. decode and exit */ - mode = strtoul(line_ptr, NULL, 8); + mode = bb_strtou(line_ptr, NULL, 8); if (outname == NULL) { outname = strchr(line_ptr, ' '); if ((outname == NULL) || (*outname == '\0')) { @@ -170,7 +180,7 @@ int uudecode_main(int argc ATTRIBUTE_UNUSED, char **argv) dst_stream = stdout; if (NOT_LONE_DASH(outname)) { dst_stream = xfopen(outname, "w"); - chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO)); + fchmod(fileno(dst_stream), mode & (S_IRWXU | S_IRWXG | S_IRWXO)); } free(line); decode_fn_ptr(src_stream, dst_stream); -- cgit v1.2.3