Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/md5_sha1_sum.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/md5_sha1_sum.c (modified) (9 diffs)

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

@@ -7 +7 @@
  */
 
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "busybox.h"
+#include "libbb.h"
 
 typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
@@ -25 +17 @@
 /* This might be useful elsewhere */
 static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
-                                      unsigned char hash_length)
+                unsigned hash_length)
 {
-    int x, len, max;
-    unsigned char *hex_value;
-
-    max = (hash_length * 2) + 2;
-    hex_value = xmalloc(max);
-    for (x = len = 0; x < hash_length; x++) {
-        len += snprintf((char*)(hex_value + len), max - len, "%02x", hash_value[x]);
-    }
-    return (hex_value);
+    /* xzalloc zero-terminates */
+    char *hex_value = xzalloc((hash_length * 2) + 1);
+    bin2hex(hex_value, (char*)hash_value, hash_length);
+    return hex_value;
 }
 
@@ -50 +37 @@
     void (*final)(void*, void*);
 
-    if (strcmp(filename, "-") == 0) {
-        src_fd = STDIN_FILENO;
-    } else if(0 > (src_fd = open(filename, O_RDONLY))) {
-        bb_perror_msg("%s", filename);
-        return NULL;
+    src_fd = STDIN_FILENO;
+    if (NOT_LONE_DASH(filename)) {
+        src_fd = open_or_warn(filename, O_RDONLY);
+        if (src_fd < 0) {
+            return NULL;
+        }
     }
 
@@ -72 +60 @@
     }
 
-    while (0 < (count = read(src_fd, in_buf, 4096))) {
+    while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
         update(in_buf, count, &context);
     }
@@ -90 +78 @@
 }
 
-/* This could become a common function for md5 as well, by using md5_stream */
-static int hash_files(int argc, char **argv, hash_algo_t hash_algo)
+int md5_sha1_sum_main(int argc, char **argv);
+int md5_sha1_sum_main(int argc, char **argv)
 {
     int return_value = EXIT_SUCCESS;
     uint8_t *hash_value;
-    unsigned int flags;
+    unsigned flags;
+    hash_algo_t hash_algo = ENABLE_MD5SUM
+        ? (ENABLE_SHA1SUM ? (applet_name[0] == 'm' ? HASH_MD5 : HASH_SHA1) : HASH_MD5)
+        : HASH_SHA1;
 
     if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
-        flags = bb_getopt_ulflags(argc, argv, "scw");
+        flags = getopt32(argv, "scw");
     else optind = 1;
 
@@ -104 +95 @@
         if (flags & FLAG_SILENT) {
             bb_error_msg_and_die
-                ("the -s option is meaningful only when verifying checksums");
+                ("-%c is meaningful only when verifying checksums", 's');
         } else if (flags & FLAG_WARN) {
             bb_error_msg_and_die
-                ("the -w option is meaningful only when verifying checksums");
+                ("-%c is meaningful only when verifying checksums", 'w');
         }
     }
 
     if (argc == optind) {
-        argv[argc++] = "-";
+        argv[argc++] = (char*)"-";
     }
 
-    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && flags & FLAG_CHECK) {
+    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
         FILE *pre_computed_stream;
         int count_total = 0;
@@ -127 +118 @@
         }
 
-        if (strcmp(file_ptr, "-") == 0) {
-            pre_computed_stream = stdin;
-        } else {
-            pre_computed_stream = bb_xfopen(file_ptr, "r");
+        pre_computed_stream = stdin;
+        if (NOT_LONE_DASH(file_ptr)) {
+            pre_computed_stream = xfopen(file_ptr, "r");
         }
 
-        while ((line = bb_get_chomped_line_from_file(pre_computed_stream)) != NULL) {
+        while ((line = xmalloc_getline(pre_computed_stream)) != NULL) {
             char *filename_ptr;
 
             count_total++;
             filename_ptr = strstr(line, "  ");
+            /* handle format for binary checksums */
+            if (filename_ptr == NULL) {
+                filename_ptr = strstr(line, " *");
+            }
             if (filename_ptr == NULL) {
                 if (flags & FLAG_WARN) {
-                    bb_error_msg("Invalid format");
+                    bb_error_msg("invalid format");
                 }
                 count_failed++;
@@ -169 +163 @@
                          count_failed, count_total);
         }
-        if (bb_fclose_nonstdin(pre_computed_stream) == EOF) {
-            bb_perror_msg_and_die("Couldnt close file %s", file_ptr);
+        /*
+        if (fclose_if_not_stdin(pre_computed_stream) == EOF) {
+            bb_perror_msg_and_die("cannot close file %s", file_ptr);
         }
+        */
     } else {
         while (optind < argc) {
@@ -185 +181 @@
         }
     }
-    return (return_value);
+    return return_value;
 }
-
-#ifdef CONFIG_MD5SUM
-int md5sum_main(int argc, char **argv)
-{
-    return (hash_files(argc, argv, HASH_MD5));
-}
-#endif
-
-#ifdef CONFIG_SHA1SUM
-int sha1sum_main(int argc, char **argv)
-{
-    return (hash_files(argc, argv, HASH_SHA1));
-}
-#endif