diff options
author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-08-10 08:05:01 +0000 |
---|---|---|
committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-08-10 08:05:01 +0000 |
commit | 1d824fd6058a12636cad8d2b25ea6ac330e895ba (patch) | |
tree | 0d273ca76efd881980824f19174e4d164522b556 | |
parent | b6b217255690486f3f741bbed5f500aa87fff247 (diff) |
add global -w option and document it; ok jmc joris
-rw-r--r-- | usr.bin/cvs/cvs.1 | 14 | ||||
-rw-r--r-- | usr.bin/cvs/cvs.c | 9 |
2 files changed, 18 insertions, 5 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 index 8446e9bf791..9b96ec8a6c9 100644 --- a/usr.bin/cvs/cvs.1 +++ b/usr.bin/cvs/cvs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.82 2005/08/09 08:44:12 jmc Exp $ +.\" $OpenBSD: cvs.1,v 1.83 2005/08/10 08:05:00 xsa Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org> @@ -32,7 +32,7 @@ .Nd OpenCVS Concurrent Versioning System .Sh SYNOPSIS .Nm -.Op Fl flnQqrtv +.Op Fl flnQqrtvw .Op Fl d Ar root .Op Fl e Ar editor .Xo @@ -109,6 +109,16 @@ The default is set to Trace program execution. .It Fl v Display version information and exit. +.It Fl w +Extract new files in read-write mode. +Overrides the setting of the +.Ev CVSREAD +environment variable. +This is the default unless +.Ev CVSREAD +is set or the +.Fl r +option is specified. .It Fl z Ar level Specify the compression level to .Xr gzip 1 diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 0f5f2012c7d..4b849eb568c 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.82 2005/08/10 07:39:48 xsa Exp $ */ +/* $OpenBSD: cvs.c,v 1.83 2005/08/10 08:05:00 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -89,7 +89,7 @@ void usage(void) { fprintf(stderr, - "Usage: %s [-flnQqrtv] [-d root] [-e editor] [-s var=val] " + "Usage: %s [-flnQqrtvw] [-d root] [-e editor] [-s var=val] " "[-T tmpdir] [-z level] command [...]\n", __progname); } @@ -271,7 +271,7 @@ cvs_getopt(int argc, char **argv) int ret; char *ep; - while ((ret = getopt(argc, argv, "b:d:e:fHlnQqrs:T:tvz:")) != -1) { + while ((ret = getopt(argc, argv, "b:d:e:fHlnQqrs:T:tvwz:")) != -1) { switch (ret) { case 'b': /* @@ -329,6 +329,9 @@ cvs_getopt(int argc, char **argv) exit(0); /* NOTREACHED */ break; + case 'w': + cvs_readonly = 0; + break; case 'x': /* * Kerberos encryption support, kept for compatibility |