enable `-xsuffixes' support as it has been added a few days ago

in rcs_statfile();
niallo ok

8 files changed, 39 insertions, 17 deletions

diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index d0fdc8e8854..f3ba8ff5f0e 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ci.c,v 1.63 2005/11/21 15:16:41 niallo Exp $	*/
+/*	$OpenBSD: ci.c,v 1.64 2005/11/21 16:20:28 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
  * All rights reserved.
@@ -44,7 +44,7 @@
 #include "diff.h"
 #include "rcsprog.h"
 
-#define CI_OPTSTRING    "d::f::i::j::k:l::m:M::N:n:qr::s:u::Vw:"
+#define CI_OPTSTRING    "d::f::i::j::k:l::m:M::N:n:qr::s:u::Vw:x:"
 #define DATE_NOW        -1
 #define DATE_MTIME      -2
 
@@ -201,6 +201,9 @@ checkin_main(int argc, char **argv)
 		case 'w':
 			pb.username = rcs_optarg;
 			break;
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			(usage)();
 			exit(1);
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index 5a7b5d32f88..18e62571879 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.29 2005/11/08 09:22:47 xsa Exp $	*/
+/*	$OpenBSD: co.c,v 1.30 2005/11/21 16:20:29 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::V")) != -1) {
+	while ((ch = rcs_getopt(argc, argv, "f::l::M::p::qr::s:u::Vx:")) != -1) {
 		switch (ch) {
 		case 'f':
 			rcs_set_rev(rcs_optarg, &rev);
@@ -97,6 +97,9 @@ checkout_main(int argc, char **argv)
 		case 'V':
 			printf("%s\n", rcs_version);
 			exit(0);
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			(usage)();
 			exit(1);
diff --git a/usr.bin/rcs/rcsclean.c b/usr.bin/rcs/rcsclean.c
index 0a5e3c55b68..3854b8a28da 100644
--- a/usr.bin/rcs/rcsclean.c
+++ b/usr.bin/rcs/rcsclean.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsclean.c,v 1.14 2005/11/17 18:14:12 xsa Exp $	*/
+/*	$OpenBSD: rcsclean.c,v 1.15 2005/11/21 16:20:29 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -53,7 +53,7 @@ rcsclean_main(int argc, char **argv)
 
 	rev = RCS_HEAD_REV;
 
-	while ((ch = rcs_getopt(argc, argv, "k:n::q::r:u::V")) != -1) {
+	while ((ch = rcs_getopt(argc, argv, "k:n::q::r:u::Vx:")) != -1) {
 		switch (ch) {
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
@@ -82,6 +82,9 @@ rcsclean_main(int argc, char **argv)
 		case 'V':
 			printf("%s\n", rcs_version);
 			exit(0);
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			break;
 		}
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index 9c808935f66..b0890fcd5c1 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsdiff.c,v 1.16 2005/11/21 15:01:10 xsa Exp $	*/
+/*	$OpenBSD: rcsdiff.c,v 1.17 2005/11/21 16:20:29 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -54,7 +54,7 @@ rcsdiff_main(int argc, char **argv)
 
 	strlcpy(diffargs, "diff", sizeof(diffargs));
 
-	while ((ch = rcs_getopt(argc, argv, "cnqr:uV")) != -1) {
+	while ((ch = rcs_getopt(argc, argv, "cnqr:uVx:")) != -1) {
 		switch (ch) {
 		case 'c':
 			strlcat(diffargs, " -c", sizeof(diffargs));
@@ -71,9 +71,6 @@ rcsdiff_main(int argc, char **argv)
 			strlcat(diffargs, " -u", sizeof(diffargs));
 			diff_format = D_UNIFIED;
 			break;
-		case 'V':
-			printf("%s\n", rcs_version);
-			exit(0);
 		case 'r':
 			if (rev == RCS_HEAD_REV) {
 				if ((rev = rcsnum_parse(rcs_optarg)) == NULL) {
@@ -87,6 +84,12 @@ rcsdiff_main(int argc, char **argv)
 				}
 			}
 			break;
+		case 'V':
+			printf("%s\n", rcs_version);
+			exit(0);
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			(usage)();
 			exit (1);
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index 34ea85038f6..c5f78166e15 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.8 2005/11/02 13:21:37 xsa Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.9 2005/11/21 16:20:29 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -50,7 +50,7 @@ rcsmerge_main(int argc, char **argv)
 
 	baserev = rev2 = RCS_HEAD_REV;
 
-	while ((ch = rcs_getopt(argc, argv, "k:p::q::r:TV")) != -1) {
+	while ((ch = rcs_getopt(argc, argv, "k:p::q::r:TVx:")) != -1) {
 		switch (ch) {
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
@@ -85,6 +85,9 @@ rcsmerge_main(int argc, char **argv)
 		case 'V':
 			printf("%s\n", rcs_version);
 			exit(0);
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			break;
 		}
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index bf05b9ff5e7..5ba59109386 100644
--- a/usr.bin/rcs/rcsprog.c
+++ b/usr.bin/rcs/rcsprog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.c,v 1.44 2005/11/21 15:16:41 niallo Exp $	*/
+/*	$OpenBSD: rcsprog.c,v 1.45 2005/11/21 16:20:29 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -392,6 +392,9 @@ rcs_main(int argc, char **argv)
 		case 'V':
 			printf("%s\n", rcs_version);
 			exit(0);
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			(usage)();
 			exit(1);
diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h
index 5e9c0f979fb..bfd0603e11b 100644
--- a/usr.bin/rcs/rcsprog.h
+++ b/usr.bin/rcs/rcsprog.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.h,v 1.21 2005/11/16 15:10:32 xsa Exp $	*/
+/*	$OpenBSD: rcsprog.h,v 1.22 2005/11/21 16:20:29 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -53,6 +53,7 @@ extern int pipeout;
 
 extern int rcs_optind;
 extern char *rcs_optarg;
+extern char *rcs_suffixes;
 extern char *rcs_tmpdir;
 
 /* date.y */
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c
index 37d07688cdf..0acf58aa3a6 100644
--- a/usr.bin/rcs/rlog.c
+++ b/usr.bin/rcs/rlog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlog.c,v 1.13 2005/11/17 18:03:51 xsa Exp $	*/
+/*	$OpenBSD: rlog.c,v 1.14 2005/11/21 16:20:29 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -58,7 +58,7 @@ rlog_main(int argc, char **argv)
 	RCSFILE *file;
 
 	hflag = Rflag = 0;
-	while ((ch = rcs_getopt(argc, argv, "hLNqRTtV")) != -1) {
+	while ((ch = rcs_getopt(argc, argv, "hLNqRTtVx:")) != -1) {
 		switch (ch) {
 		case 'h':
 			hflag = 1;
@@ -86,6 +86,9 @@ rlog_main(int argc, char **argv)
 		case 'V':
 			printf("%s\n", rcs_version);
 			exit(0);
+		case 'x':
+			rcs_suffixes = rcs_optarg;
+			break;
 		default:
 			break;
 		}