summaryrefslogtreecommitdiff
path: root/usr.bin/rcs
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-11-23 08:42:24 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-11-23 08:42:24 +0000
commit6a45a0cd4eeb4980b559bb6568c7f5803464962e (patch)
tree454e35b1f627ea61ed510bf97887121ac9f3e281 /usr.bin/rcs
parentc53edc0a40807d84e4ca637c44a33f9f6e10081f (diff)
sync SYNOPSIS with Reality and usage() accordingly;
Diffstat (limited to 'usr.bin/rcs')
-rw-r--r--usr.bin/rcs/co.114
-rw-r--r--usr.bin/rcs/co.c10
2 files changed, 14 insertions, 10 deletions
diff --git a/usr.bin/rcs/co.1 b/usr.bin/rcs/co.1
index 3b416c6df41..2f023de7d12 100644
--- a/usr.bin/rcs/co.1
+++ b/usr.bin/rcs/co.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: co.1,v 1.12 2005/11/21 21:42:00 jmc Exp $
+.\" $OpenBSD: co.1,v 1.13 2005/11/23 08:42:23 xsa Exp $
.\"
.\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
.\" All rights reserved.
@@ -23,14 +23,16 @@
.Sh SYNOPSIS
.Nm
.Bk -words
-.Op Fl fIqV
-.Op Ar rev
+.Op Fl V
.Op Fl d Ns Ar date
+.Op Fl f Ns Op Ar rev
+.Op Fl I Ns Op Ar rev
.Op Fl k Ns Ar mode
.Op Fl l Ns Op Ar rev
.Op Fl M Ns Op Ar rev
.Op Fl m Ns Ar msg
.Op Fl p Ns Op Ar rev
+.Op Fl q Ns Op Ar rev
.Op Fl r Ns Op Ar rev
.Op Fl s Ns Ar state
.Op Fl u Ns Op Ar rev
@@ -48,9 +50,9 @@ The following options are supported:
.It Fl d Ns Ar date
Retrieve revision as of the latest revision no later than
.Ar date .
-.It Fl f
+.It Fl f Ns Op Ar rev
Force the overwriting of the working file.
-.It Fl I
+.It Fl I Ns Op Ar rev
Interactive mode.
.It Fl k Ns Ar mode
Specify the keyword substitution mode.
@@ -73,7 +75,7 @@ to standard output.
If
.Ar rev
is not specified, print HEAD.
-.It Fl q
+.It Fl q Ns Op Ns Ar rev
Be quiet about reporting.
.It Fl r Ns Op Ar rev
Retrieve the latest revision no later than
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index eb170d5a9ab..5c247cd98a4 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: co.c,v 1.31 2005/11/22 16:20:45 xsa Exp $ */
+/* $OpenBSD: co.c,v 1.32 2005/11/23 08:42:23 xsa Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -59,7 +59,7 @@ checkout_main(int argc, char **argv)
exit (1);
}
- while ((ch = rcs_getopt(argc, argv, "f::l::M::p::qr::s:u::Vx:")) != -1) {
+ while ((ch = rcs_getopt(argc, argv, "f::l::M::p::q::r::s:u::Vx:")) != -1) {
switch (ch) {
case 'f':
rcs_set_rev(rcs_optarg, &rev);
@@ -78,6 +78,7 @@ checkout_main(int argc, char **argv)
pipeout = 1;
break;
case 'q':
+ rcs_set_rev(rcs_optarg, &rev);
verbose = 0;
break;
case 'r':
@@ -161,8 +162,9 @@ void
checkout_usage(void)
{
fprintf(stderr,
- "usage: co [-qV] [-l[rev]] [-M[rev]] [-p[rev]] [-r[rev]]\n"
- " [-sstate] [-u[rev]] file ...\n");
+ "usage: co [-V] [-ddate] [-f[rev]] [-I[rev]] [-kmode] [-l[rev]]\n"
+ " [-M[rev]] [-mmsg] [-p[rev]] [-q[rev]] [-r[rev]]\n"
+ " [-sstate] [-u[rev]] [-wuser] [-xsuffixes] [-ztz] file ...\n");
}
/*