summaryrefslogtreecommitdiff
path: root/bin/md5
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2014-01-15 16:07:28 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2014-01-15 16:07:28 +0000
commit2beb74738ad28efd755017482d47401650145921 (patch)
tree1b8856ca21bca426ee1438302cfe80cea59cb79f /bin/md5
parentd54cefd584c250e9d54b1b6fdddf5321b9900d4c (diff)
add -C to the man page, and adjust usage();
ok lteo
Diffstat (limited to 'bin/md5')
-rw-r--r--bin/md5/cksum.116
-rw-r--r--bin/md5/md5.c8
2 files changed, 18 insertions, 6 deletions
diff --git a/bin/md5/cksum.1 b/bin/md5/cksum.1
index 4f67ce8cb98..f19d99a994e 100644
--- a/bin/md5/cksum.1
+++ b/bin/md5/cksum.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cksum.1,v 1.28 2014/01/10 20:14:08 jmc Exp $
+.\" $OpenBSD: cksum.1,v 1.29 2014/01/15 16:07:27 jmc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)cksum.1 8.2 (Berkeley) 4/28/95
.\"
-.Dd $Mdocdate: January 10 2014 $
+.Dd $Mdocdate: January 15 2014 $
.Dt CKSUM 1
.Os
.Sh NAME
@@ -44,6 +44,7 @@
.Bk -words
.Op Fl bcpqrtx
.Op Fl a Ar algorithms
+.Op Fl C Ar checklist
.Op Fl h Ar hashfile
.Op Fl o Ar 1 | 2
.Op Fl s Ar string
@@ -52,6 +53,7 @@
.Nm sum
.Op Fl bcpqrtx
.Op Fl a Ar algorithms
+.Op Fl C Ar checklist
.Op Fl h Ar hashfile
.Op Fl o Ar 1 | 2
.Op Fl s Ar string
@@ -150,6 +152,16 @@ This option is ignored for the
and
.Ar sysvsum
algorithms, which do not use hexadecimal output.
+.It Fl C Ar checklist
+Compare the checksum of each
+.Ar file
+against the checksums in the
+.Ar checklist .
+Any specified
+.Ar file
+that is not listed in the
+.Ar checklist
+is ignored.
.It Fl c
If this option is specified, the
.Ar file
diff --git a/bin/md5/md5.c b/bin/md5/md5.c
index dd9a60ea6a6..7f651af2e50 100644
--- a/bin/md5/md5.c
+++ b/bin/md5/md5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5.c,v 1.70 2014/01/15 04:43:36 lteo Exp $ */
+/* $OpenBSD: md5.c,v 1.71 2014/01/15 16:07:27 jmc Exp $ */
/*
* Copyright (c) 2001,2003,2005-2007,2010,2013,2014
@@ -836,9 +836,9 @@ usage(void)
{
#if !defined(SHA2_ONLY)
if (strcmp(__progname, "cksum") == 0 || strcmp(__progname, "sum") == 0)
- fprintf(stderr, "usage: %s [-bcpqrtx] [-C checklist] [-a algorithms] "
- "[-h hashfile] [-o 1 | 2] [-s string]\n"
- " [file ...]\n",
+ fprintf(stderr, "usage: %s [-bcpqrtx] [-a algorithms] [-C checklist] "
+ "[-h hashfile] [-o 1 | 2]\n"
+ " [-s string] [file ...]\n",
__progname);
else
#endif /* !defined(SHA2_ONLY) */