Wrap a table (bg set to black, width=80%) around the screenshot

[oweals/busybox.git] / md5sum.c

diff --git a/md5sum.c b/md5sum.c
index 2c08b29c51feede2e23bd03ea1adb607770b71f6..ad4078040138da8e9dfd2587f0e8da5340dc27f3 100644 (file)
--- a/md5sum.c
+++ b/md5sum.c
@@ -26,6 +26,12 @@
 #include <ctype.h>
 #include <getopt.h>
 
+/* For some silly reason, this file uses backwards TRUE and FALSE conventions */
+#undef TRUE
+#undef FALSE
+#define FALSE   ((int) 1)
+#define TRUE    ((int) 0)
+
 //----------------------------------------------------------------------------
 //--------md5.c
 //----------------------------------------------------------------------------
@@ -85,7 +91,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _MD5_H
-#define _MD5_H 1
+static const int _MD5_H = 1;
 
 #include <stdio.h>
 
@@ -245,7 +251,7 @@ void *md5_finish_ctx(struct md5_ctx *ctx, void *resbuf)
 int md5_stream(FILE *stream, void *resblock)
 {
   /* Important: BLOCKSIZE must be a multiple of 64.  */
-#define BLOCKSIZE 4096
+static const int BLOCKSIZE = 4096;
   struct md5_ctx ctx;
   char buffer[BLOCKSIZE + 72];
   size_t sum;
@@ -523,7 +529,7 @@ void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ctx)
 /* The minimum length of a valid digest line in a file produced
    by `md5sum FILE' and read by `md5sum -c'.  This length does
    not include any newline character at the end of a line.  */
-#define MIN_DIGEST_LINE_LENGTH 35 /* 32 - message digest length
+static const int MIN_DIGEST_LINE_LENGTH = 35; /* 32 - message digest length
                                       2 - blank and binary indicator
                                       1 - minimum filename length */
 
@@ -699,7 +705,7 @@ static int md5_check(const char *checkfile_name)
     fgets(line, BUFSIZ-1, checkfile_stream);
     line_length = strlen(line);
 
-    if (line_length <= 0)
+    if (line_length <= 0 || line==NULL)
       break;
 
     /* Ignore comment lines, which begin with a '#' character.  */
@@ -757,9 +763,6 @@ static int md5_check(const char *checkfile_name)
 
   while (!feof(checkfile_stream) && !ferror(checkfile_stream));
 
-  if (line)
-    free(line);
-
   if (ferror(checkfile_stream)) {
     error_msg("%s: read error\n", checkfile_name); /* */
     return FALSE;
@@ -852,31 +855,26 @@ int md5sum_main(int argc,
   }
 
   if (file_type_specified && do_check) {
-    error_msg("the -b and -t options are meaningless when verifying checksums\n");
-       return EXIT_FAILURE;
+    error_msg_and_die("the -b and -t options are meaningless when verifying checksums\n");
   }
 
   if (n_strings > 0 && do_check) {
-    error_msg("the -g and -c options are mutually exclusive\n");
-       return EXIT_FAILURE;
+    error_msg_and_die("the -g and -c options are mutually exclusive\n");
   }
 
   if (status_only && !do_check) {
-    error_msg("the -s option is meaningful only when verifying checksums\n");
-       return EXIT_FAILURE;
+    error_msg_and_die("the -s option is meaningful only when verifying checksums\n");
   }
 
   if (warn && !do_check) {
-    error_msg("the -w option is meaningful only when verifying checksums\n");
-       return EXIT_FAILURE;
+    error_msg_and_die("the -w option is meaningful only when verifying checksums\n");
   }
 
   if (n_strings > 0) {
     size_t i;
 
     if (optind < argc) {
-      error_msg("no files may be specified when using -g\n");
-         return EXIT_FAILURE;
+      error_msg_and_die("no files may be specified when using -g\n");
     }
     for (i = 0; i < n_strings; ++i) {
       size_t cnt;
@@ -942,13 +940,11 @@ int md5sum_main(int argc,
   }
 
   if (fclose (stdout) == EOF) {
-    error_msg("write error\n");
-       return EXIT_FAILURE;
+    error_msg_and_die("write error\n");
   }
 
   if (have_read_stdin && fclose (stdin) == EOF) {
-    error_msg("standard input\n");
-       return EXIT_FAILURE;
+    error_msg_and_die("standard input\n");
   }
 
   if (err == 0)