Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/cksum.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/cksum.c (modified) (1 diff)

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

@@ -5 +5 @@
  * 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. */
-
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
 #include "libbb.h"
 
-int cksum_main(int argc, char **argv);
-int cksum_main(int argc, char **argv)
+/* This is a NOEXEC applet. Be very careful! */
+
+int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
     uint32_t *crc32_table = crc32_filltable(NULL, 1);
+    uint32_t crc;
+    off_t length, filesize;
+    int bytes_read;
+    int exit_code = EXIT_SUCCESS;
 
-    FILE *fp;
-    uint32_t crc;
-    long length, filesize;
-    int bytes_read;
-    char *cp;
-
-    int inp_stdin = (argc == optind) ? 1 : 0;
+#if ENABLE_DESKTOP
+    getopt32(argv, ""); /* coreutils 6.9 compat */
+    argv += optind;
+#else
+    argv++;
+#endif
 
     do {
-        fp = fopen_or_warn_stdin((inp_stdin) ? bb_msg_standard_input : *++argv);
+        int fd = open_or_warn_stdin(*argv ? *argv : bb_msg_standard_input);
 
+        if (fd < 0) {
+            exit_code = EXIT_FAILURE;
+            continue;
+        }
         crc = 0;
         length = 0;
 
 #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];
+        while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
+            crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
         }
+        close(fd);
 
         filesize = length;
 
-        for (; length; length >>= 8)
-            crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ length) & 0xffL];
-        crc ^= 0xffffffffL;
+        while (length) {
+            crc = (crc << 8) ^ crc32_table[(uint8_t)(crc >> 24) ^ (uint8_t)length];
+            /* must ensure that shift is unsigned! */
+            if (sizeof(length) <= sizeof(unsigned))
+                length = (unsigned)length >> 8;
+            else if (sizeof(length) <= sizeof(unsigned long))
+                length = (unsigned long)length >> 8;
+            else
+                length = (unsigned long long)length >> 8;
+        }
+        crc = ~crc;
 
-        if (inp_stdin) {
-            printf("%" PRIu32 " %li\n", crc, filesize);
-            break;
-        }
+        printf((*argv ? "%"PRIu32" %"OFF_FMT"i %s\n" : "%"PRIu32" %"OFF_FMT"i\n"),
+                crc, filesize, *argv);
+    } while (*argv && *++argv);
 
-        printf("%" PRIu32 " %li %s\n", crc, filesize, *argv);
-        fclose(fp);
-    } while (*(argv + 1));
-
-    fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(exit_code);
 }