===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- src/usr.bin/rcs/rcsmerge.c	2006/03/23 08:50:41	1.22
+++ src/usr.bin/rcs/rcsmerge.c	2006/03/24 05:14:48	1.23
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.22 2006/03/23 08:50:41 xsa Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.23 2006/03/24 05:14:48 ray Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -42,7 +42,7 @@
 
 	baserev = rev2 = RCS_HEAD_REV;
 
-	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r:TVx:z:")) != -1) {
+	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r:TVx::z:")) != -1) {
 		switch (ch) {
 		case 'A': case 'E': case 'e':
 			break;
@@ -81,7 +81,8 @@
 			exit(0);
 			/* NOTREACHED */
 		case 'x':
-			rcs_suffixes = rcs_optarg;
+			/* Use blank extension if none given. */
+			rcs_suffixes = rcs_optarg ? rcs_optarg : "";
 			break;
 		case 'z':
 			timezone_flag = rcs_optarg;