diff options
Diffstat (limited to 'bin/md5')
| -rw-r--r-- | bin/md5/CVS/Entries | 12 | ||||
| -rw-r--r-- | bin/md5/md5.c | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/bin/md5/CVS/Entries b/bin/md5/CVS/Entries index 86ca07f..59b6c45 100644 --- a/bin/md5/CVS/Entries +++ b/bin/md5/CVS/Entries @@ -1,7 +1,7 @@ -/Makefile/1.15/Wed Mar 30 06:38:40 2016// -/cksum.1/1.39/Sat Sep 3 17:01:01 2016// -/crc.c/1.5/Fri Jan 25 00:19:25 2019// -/crc.h/1.4/Fri Jan 25 00:19:25 2019// -/md5.1/1.48/Fri Jan 25 00:19:25 2019// -/md5.c/1.95/Sat May 18 16:53:39 2019// +/Makefile/1.15/Mon Oct 19 10:44:53 2020// +/cksum.1/1.39/Mon Oct 19 10:44:53 2020// +/crc.c/1.5/Mon Oct 19 10:44:53 2020// +/crc.h/1.4/Mon Oct 19 10:44:53 2020// +/md5.1/1.48/Mon Oct 19 10:44:53 2020// +/md5.c/1.97/Result of merge// D diff --git a/bin/md5/md5.c b/bin/md5/md5.c index 069b2f5..f85c690 100644 --- a/bin/md5/md5.c +++ b/bin/md5/md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.c,v 1.95 2019/05/18 16:53:39 otto Exp $ */ +/* $OpenBSD: md5.c,v 1.97 2020/10/19 18:15:18 millert Exp $ */ /* * Copyright (c) 2001,2003,2005-2007,2010,2013,2014 @@ -506,7 +506,8 @@ digest_file(const char *file, struct hash_list *hl, int echo) while ((nread = fread(data, 1UL, sizeof(data), fp)) != 0) { if (echo) { (void)fwrite(data, nread, 1UL, stdout); - if (fflush(stdout) != 0) + (void)fflush(stdout); + if (ferror(stdout)) err(1, "stdout: write error"); } TAILQ_FOREACH(hf, hl, tailq) @@ -778,7 +779,7 @@ digest_time(struct hash_list *hl, int times) digest_end(hf, &context, digest, sizeof(digest), hf->base64); getrusage(RUSAGE_SELF, &stop); timersub(&stop.ru_utime, &start.ru_utime, &res); - elapsed = res.tv_sec + res.tv_usec / 1000000.0; + elapsed = (double)res.tv_sec + (double)res.tv_usec / 1000000.0; (void)printf("\nDigest = %s\n", digest); (void)printf("Time = %f seconds\n", elapsed); |