diff options
Diffstat (limited to 'coreutils/md5_sha1_sum.c')
-rw-r--r-- | coreutils/md5_sha1_sum.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index 0e57673f1..b4bdc262c 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c | |||
@@ -301,9 +301,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv) | |||
301 | 301 | ||
302 | count_total++; | 302 | count_total++; |
303 | filename_ptr = strchr(line, ' '); | 303 | filename_ptr = strchr(line, ' '); |
304 | if (filename_ptr == NULL | 304 | if (!filename_ptr) { |
305 | || (filename_ptr[1] != ' ' && filename_ptr[1] != '*') | ||
306 | ) { | ||
307 | if (flags & FLAG_WARN) { | 305 | if (flags & FLAG_WARN) { |
308 | bb_simple_error_msg("invalid format"); | 306 | bb_simple_error_msg("invalid format"); |
309 | } | 307 | } |
@@ -312,8 +310,13 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv) | |||
312 | free(line); | 310 | free(line); |
313 | continue; | 311 | continue; |
314 | } | 312 | } |
315 | *filename_ptr = '\0'; | 313 | *filename_ptr++ = '\0'; |
316 | filename_ptr += 2; | 314 | /* coreutils 9.1 allows "HASH FILENAME" format, |
315 | * with only one space. Skip the 'correct' | ||
316 | * " " or " *" delimiter if it is there: | ||
317 | */ | ||
318 | if (*filename_ptr == ' ' || *filename_ptr == '*') | ||
319 | filename_ptr++; | ||
317 | 320 | ||
318 | hash_value = hash_file(in_buf, filename_ptr, sha3_width); | 321 | hash_value = hash_file(in_buf, filename_ptr, sha3_width); |
319 | 322 | ||