Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/cksum.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/cksum.c (modified) (3 diffs)

branches/2.2.5/mindi-busybox/coreutils/cksum.c

@@ -4 +4 @@
  *
  * 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"
+#include "libbb.h"
 
-int cksum_main(int argc, char **argv) {
-    
-    uint32_t *crc32_table = bb_crc32_filltable(1);
+int cksum_main(int argc, char **argv);
+int cksum_main(int argc, char **argv)
+{
+    uint32_t *crc32_table = crc32_filltable(NULL, 1);
 
     FILE *fp;
@@ -21 +19 @@
     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);
-            
+        fp = fopen_or_warn_stdin((inp_stdin) ? bb_msg_standard_input : *++argv);
+
         crc = 0;
         length = 0;
-        
-        while ((bytes_read = fread(buf, 1, BUFSIZ, fp)) > 0) {
-            cp = buf;
+
+#define read_buf bb_common_bufsiz1
+        while ((bytes_read = fread(read_buf, 1, BUFSIZ, fp)) > 0) {
+            cp = read_buf;
             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];
@@ -44 +43 @@
 
         if (inp_stdin) {
-            printf("%"PRIu32" %li\n", crc, filesize);
+            printf("%" PRIu32 " %li\n", crc, filesize);
             break;
         }
-        
-        printf("%"PRIu32" %li %s\n", crc, filesize, *argv); 
+
+        printf("%" PRIu32 " %li %s\n", crc, filesize, *argv);
         fclose(fp);
-    } while (*(argv+1));
-    
-    return EXIT_SUCCESS;
+    } while (*(argv + 1));
+
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }