===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsutil.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/rcs/rcsutil.c	2006/05/08 21:55:39	1.9
--- src/usr.bin/rcs/rcsutil.c	2006/05/09 12:31:27	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: rcsutil.c,v 1.9 2006/05/08 21:55:39 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: rcsutil.c,v 1.10 2006/05/09 12:31:27 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 144,150 ****
  	int fd;
  	struct stat sb;
  	char *p, *ext, name[MAXPATHLEN], *next, *ptr, rcsdir[MAXPATHLEN],
! 	    *ret, *suffixes, rcspath[MAXPATHLEN];
  
  	/* If -x flag was not given, use default. */
  	if (rcs_suffixes == NULL)
--- 144,150 ----
  	int fd;
  	struct stat sb;
  	char *p, *ext, name[MAXPATHLEN], *next, *ptr, rcsdir[MAXPATHLEN],
! 	    *suffixes, rcspath[MAXPATHLEN];
  
  	/* If -x flag was not given, use default. */
  	if (rcs_suffixes == NULL)
***************
*** 209,215 ****
  	 * extension.
  	 */
  	suffixes = xstrdup(rcs_suffixes);
! 	for (ret = NULL, next = suffixes; (ext = strsep(&next, "/")) != NULL;) {
  		char fpath[MAXPATHLEN];
  
  		if ((p = strrchr(rcspath, ',')) != NULL) {
--- 209,215 ----
  	 * extension.
  	 */
  	suffixes = xstrdup(rcs_suffixes);
! 	for (next = suffixes; (ext = strsep(&next, "/")) != NULL;) {
  		char fpath[MAXPATHLEN];
  
  		if ((p = strrchr(rcspath, ',')) != NULL) {
***************
*** 251,259 ****
  	}
  
  	/*
- 	 * `ret' is still NULL.  No RCS file with any extension exists
- 	 * so we use the first extension.
- 	 *
  	 * `suffixes' should now be NUL separated, so the first
  	 * extension can be read just by reading `suffixes'.
  	 */
--- 251,256 ----