aboutsummaryrefslogtreecommitdiff
path: root/sbin/md5/md5.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2001-12-19 21:19:43 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2001-12-19 21:19:43 +0000
commitdc015e16dcb84ae712447a9f984fccb2d40dca24 (patch)
tree842b78d03e12696568035b2773c54dcbacfee786 /sbin/md5/md5.c
parent96efd94a01c43b9cab031d755913df7f94cd63cc (diff)
downloadsrc-dc015e16dcb84ae712447a9f984fccb2d40dca24.tar.gz
src-dc015e16dcb84ae712447a9f984fccb2d40dca24.zip
Fix
md5 -q -s foo to not expect input on stdin after hashing the string. MFC after: 1 week
Notes
Notes: svn path=/head/; revision=88226
Diffstat (limited to 'sbin/md5/md5.c')
-rw-r--r--sbin/md5/md5.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 5e3c9cb15cfa..bd8a39899ec7 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -39,6 +39,7 @@ static const char rcsid[] =
int qflag;
int rflag;
+int sflag;
static void MDString(const char *);
static void MDTimeTrial(void);
@@ -74,6 +75,7 @@ main(int argc, char *argv[])
rflag = 1;
break;
case 's':
+ sflag = 1;
MDString(optarg);
break;
case 't':
@@ -101,7 +103,7 @@ main(int argc, char *argv[])
else
printf("MD5 (%s) = %s\n", *argv, p);
} while (*++argv);
- } else if (optind == 1 || qflag || rflag)
+ } else if (!sflag && (optind == 1 || qflag || rflag))
MDFilter(0);
return (0);