emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up the -s option, and make usage consitent with behaviour,

Browse Source 
patch by Steven Scholz
This commit is contained in:
Glenn L McGrath 2003-11-20 05:58:26 +00:00
parent d85421de22
commit 5c069aaf2f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
coreutils/md5_sha1_sum.c
View File

@ -143,16 +143,18 @@ extern int hash_files(int argc, char **argv, const uint8_t hash_algo)
hash_value = hash_file(filename_ptr, hash_algo); hash_value = hash_file(filename_ptr, hash_algo);
if (hash_value && (strcmp(hash_value, line) == 0)) { if (hash_value && (strcmp(hash_value, line) == 0)) {
printf("%s: OK\n", filename_ptr); if (!(flags & FLAG_SILENT))
printf("%s: OK\n", filename_ptr);
} else { } else {
printf("%s: FAILED\n", filename_ptr); if (!(flags & FLAG_SILENT))
printf("%s: FAILED\n", filename_ptr);
count_failed++; count_failed++;
} }
/* possible free(NULL) */ /* possible free(NULL) */
free(hash_value); free(hash_value);
free(line); free(line);
} }
if (count_failed) { if (count_failed && !(flags & FLAG_SILENT)) {
bb_error_msg("WARNING: %d of %d computed checksums did NOT match", bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
count_failed, count_total); count_failed, count_total);
} }
@ -178,10 +180,7 @@ extern int hash_files(int argc, char **argv, const uint8_t hash_algo)
if (hash_value == NULL) { if (hash_value == NULL) {
return_value++; return_value++;
} else { } else {
#ifdef CONFIG_FEATURE_MD5_SHA1_SUM_CHECK printf("%s %s\n", hash_value, file_ptr);
if (!flags & FLAG_SILENT)
#endif
printf("%s %s\n", hash_value, file_ptr);
free(hash_value); free(hash_value);
} }
} }