diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-01-27 15:42:36 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-01-27 15:42:36 +0000 |
| commit | 82f0d775f8fd2e98ab3e847a1b8707c156ca8adc (patch) | |
| tree | 89437988ca9ec96a94c7b502cf0dd5cdfb56bc53 /usr.bin | |
| parent | 71bcfb9f51df6ee8fd8f1417284d7acff7766b63 (diff) | |
CVS_EX_BADROOT return code is not worth keeping;
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/cvs.1 | 6 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.h | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/tag.c | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 index 620691f90ef..caee7e00e73 100644 --- a/usr.bin/cvs/cvs.1 +++ b/usr.bin/cvs/cvs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.92 2006/01/06 17:09:01 jmc Exp $ +.\" $OpenBSD: cvs.1,v 1.93 2006/01/27 15:42:35 xsa Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org> @@ -2047,9 +2047,7 @@ The remote system returned something that was not possible during a protocol exchange. .It Dv CVS_EX_FILE Pq 4 An error occurred while doing an operation on a file. -.It Dv CVS_EX_BADTAG Pq 5 -An error occurred while doing a tagging/untagging operation. -.It Dv CVS_EX_BADROOT Pq 6 +.It Dv CVS_EX_BADROOT Pq 5 The .Ev CVSROOT was not given or does not match the expected format. diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index a00ec4b69a0..5953247a916 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.98 2006/01/10 08:24:57 xsa Exp $ */ +/* $OpenBSD: cvs.h,v 1.99 2006/01/27 15:42:35 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -46,8 +46,7 @@ #define CVS_EX_DATA 2 #define CVS_EX_PROTO 3 #define CVS_EX_FILE 4 -#define CVS_EX_BADTAG 5 -#define CVS_EX_BADROOT 6 +#define CVS_EX_BADROOT 5 /* operations */ #define CVS_OP_UNKNOWN 0 diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c index b83264d704c..57696baaff6 100644 --- a/usr.bin/cvs/tag.c +++ b/usr.bin/cvs/tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tag.c,v 1.37 2006/01/27 08:50:51 xsa Exp $ */ +/* $OpenBSD: tag.c,v 1.38 2006/01/27 15:42:35 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2004 Joris Vink <joris@openbsd.org> @@ -131,12 +131,9 @@ cvs_tag_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg) *arg += 1; } - if (!rcs_sym_check(tag_name)) { - cvs_log(LP_ABORT, - "tag `%s' must not contain the characters `%s'", + if (!rcs_sym_check(tag_name)) + fatal("tag `%s' must not contain the characters `%s'", tag_name, RCS_SYM_INVALCHAR); - return (CVS_EX_BADTAG); - } if ((tag_branch == 1) && (tag_delete == 1)) { cvs_log(LP_WARN, "ignoring -b with -d options"); |