diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | src/md5sum.c | 20 | ||||
| -rwxr-xr-x | tests/misc/md5sum.pl | 7 |
3 files changed, 23 insertions, 8 deletions
@@ -28,6 +28,10 @@ GNU coreutils NEWS -*- outline -*- ls --time-style no longer mishandles '%%b' in formats. [bug introduced in coreutils-7.2] + md5sum --check --ignore-missing no longer treats files with checksums + starting with "00" as missing. This also affects sha*sum. + [bug introduced with the --ignore-missing feature in coreutils-8.25] + nl now resets numbering for each page section rather than just for each page. [This bug was present in "the beginning".] diff --git a/src/md5sum.c b/src/md5sum.c index 5a39a4f05..6e85cb150 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -463,15 +463,19 @@ print_filename (char const *file, bool escape) text because it was a terminal. Put the checksum in *BIN_RESULT, which must be properly aligned. + Put true in *MISSING if the file can't be opened due to ENOENT. Return true if successful. */ static bool -digest_file (const char *filename, int *binary, unsigned char *bin_result) +digest_file (const char *filename, int *binary, unsigned char *bin_result, + bool *missing) { FILE *fp; int err; bool is_stdin = STREQ (filename, "-"); + *missing = false; + if (is_stdin) { have_read_stdin = true; @@ -491,7 +495,7 @@ digest_file (const char *filename, int *binary, unsigned char *bin_result) { if (ignore_missing && errno == ENOENT) { - *bin_result = '\0'; + *missing = true; return true; } error (0, errno, "%s", quotef (filename)); @@ -604,14 +608,14 @@ digest_check (const char *checkfile_name) '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; bool ok; + bool missing; /* Only escape in the edge case producing multiple lines, to ease automatic processing of status output. */ bool needs_escape = ! status_only && strchr (filename, '\n'); properly_formatted_lines = true; - *bin_buffer = '\1'; /* flag set to 0 for ignored missing files. */ - ok = digest_file (filename, &binary, bin_buffer); + ok = digest_file (filename, &binary, bin_buffer, &missing); if (!ok) { @@ -624,10 +628,9 @@ digest_check (const char *checkfile_name) printf (": %s\n", _("FAILED open or read")); } } - else if (ignore_missing && ! *bin_buffer) + else if (ignore_missing && missing) { - /* Treat an empty buffer as meaning a missing file, - which is ignored with --ignore-missing. */ + /* Ignore missing files with --ignore-missing. */ ; } else @@ -878,8 +881,9 @@ main (int argc, char **argv) else { int file_is_binary = binary; + bool missing; - if (! digest_file (file, &file_is_binary, bin_buffer)) + if (! digest_file (file, &file_is_binary, bin_buffer, &missing)) ok = false; else { diff --git a/tests/misc/md5sum.pl b/tests/misc/md5sum.pl index 2eb636937..6ea745721 100755 --- a/tests/misc/md5sum.pl +++ b/tests/misc/md5sum.pl @@ -149,6 +149,13 @@ my @Tests = {ERR=> "md5sum: f.md5: no file was verified\n"}, {EXIT=> 1}], + # coreutils-8.25 with --ignore-missing treated checksums starting with 00 + # as if the file was not present + ['check-ignore-missing-6', '--check', '--ignore-missing', + {AUX=> {f=> '9t'}}, + {IN=> {'f.md5' => + "006999e6df389641adf1fa3a74801d9d f\n"}}, + {OUT=>"f: OK\n"}], ['bsd-segv', '--check', {IN=> {'z' => "MD5 ("}}, {EXIT=> 1}, {ERR=> "$prog: z: no properly formatted MD5 checksum lines found\n"}], |