svn commit: branches/busybox_scratch/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2006-08-20 03:51:49 -0700 (Sun, 20 Aug 2006)
New Revision: 15834

Log:
- shrink cksum a bit: use bb_common_bufsiz1
   text	   data	    bss	    dec	    hex	filename
    288	      0	      0	    288	    120	coreutils/cksum.o.orig
    273	      0	      0	    273	    111	coreutils/cksum.o



Modified:
   branches/busybox_scratch/coreutils/cksum.c


Changeset:
Modified: branches/busybox_scratch/coreutils/cksum.c
===================================================================
--- branches/busybox_scratch/coreutils/cksum.c	2006-08-20 10:46:04 UTC (rev 15833)
+++ branches/busybox_scratch/coreutils/cksum.c	2006-08-20 10:51:49 UTC (rev 15834)
@@ -3,16 +3,14 @@
  * 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 <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include "busybox.h"
 
-int cksum_main(int argc, char **argv) {
-	
+int cksum_main(int argc, char **argv)
+{
+
 	uint32_t *crc32_table = bb_crc32_filltable(1);
 
 	FILE *fp;
@@ -20,36 +18,36 @@
 	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;
 }