From 73561cc75ac31e63bcab4b4ebfaf738e4ca225e6 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 28 Aug 2006 23:31:54 +0000 Subject: - pull from busybox_scratch: r15829:15850 Various fixes, cleanups and shrinkage: saves 952 Bytes: text data bss dec hex filename 1087742 15853 790632 1894227 1ce753 ../busybox/busybox.old 1086790 15853 790632 1893275 1ce39b busybox via: # scripts/bloat-o-meter ../busybox/busybox_unstripped.old busybox_unstripped function old new delta ipcrm_main 756 822 +66 getval - 61 +61 maybe_set_utc - 40 +40 udhcpc_main 2896 2912 +16 md5_hash_block 428 437 +9 opt 8 16 +8 qgravechar 106 110 +4 make_bitmap 292 295 +3 inflate_unzip 2056 2059 +3 add_partition 1412 1414 +2 __parsespent 156 158 +2 qrealloc 41 42 +1 format - 1 +1 catv_main 313 314 +1 watch_main 293 292 -1 varunset 81 80 -1 part 1 - -1 check_if_skip 837 836 -1 start_stop_daemon_main 840 837 -3 create_lost_and_found 175 172 -3 supress_non_delimited_lines 4 - -4 static.l 4 - -4 static.c 5 1 -4 bsd_sum_file 237 233 -4 eval2 338 332 -6 arithmetic_common 166 158 -8 cmpfunc 22 5 -17 cksum_main 294 275 -19 cmp_main 465 439 -26 dd_main 1535 1508 -27 rmmod_main 376 333 -43 cut_file 727 644 -83 ipcs_main 3809 3721 -88 cut_main 722 614 -108 date_main 1443 1263 -180 remove_ids 222 - -222 ------------------------------------------------------------------------------ (add/remove: 3/4 grow/shrink: 11/18 up/down: 217/-853) Total: -636 bytes --- coreutils/cksum.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'coreutils/cksum.c') diff --git a/coreutils/cksum.c b/coreutils/cksum.c index 5849ddab2..9a45fd656 100644 --- a/coreutils/cksum.c +++ b/coreutils/cksum.c @@ -3,12 +3,13 @@ * cksum - calculate the CRC32 checksum of a file * * Copyright (C) 2006 by Rob Sullivan, with ideas from code by Walter Harms - * + * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include "busybox.h" -int cksum_main(int argc, char **argv) { +int cksum_main(int argc, char **argv) +{ uint32_t *crc32_table = crc32_filltable(1); @@ -17,36 +18,36 @@ int cksum_main(int argc, char **argv) { long length, filesize; int bytes_read; char *cp; - RESERVE_CONFIG_BUFFER(buf, BUFSIZ); + int inp_stdin = (argc == optind) ? 1 : 0; - + do { fp = bb_wfopen_input((inp_stdin) ? bb_msg_standard_input : *++argv); - + crc = 0; length = 0; - - while ((bytes_read = fread(buf, 1, BUFSIZ, fp)) > 0) { - cp = buf; + + while ((bytes_read = fread(bb_common_bufsiz1, 1, BUFSIZ, fp)) > 0) { + cp = bb_common_bufsiz1; length += bytes_read; while (bytes_read--) crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ (*cp++)) & 0xffL]; } - + filesize = length; - + for (; length; length >>= 8) crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ length) & 0xffL]; crc ^= 0xffffffffL; if (inp_stdin) { - printf("%"PRIu32" %li\n", crc, filesize); + bb_printf("%" PRIu32 " %li\n", crc, filesize); break; } - - printf("%"PRIu32" %li %s\n", crc, filesize, *argv); + + bb_printf("%" PRIu32 " %li %s\n", crc, filesize, *argv); fclose(fp); - } while (*(argv+1)); - + } while (*(argv + 1)); + return EXIT_SUCCESS; } -- cgit v1.2.3