===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -c -r1.134 -r1.135
*** src/usr.bin/cvs/cvs.c	2007/09/19 12:14:21	1.134
--- src/usr.bin/cvs/cvs.c	2007/09/19 12:26:16	1.135
***************
*** 1,4 ****
! /*	$OpenBSD: cvs.c,v 1.134 2007/09/19 12:14:21 tobias Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: cvs.c,v 1.135 2007/09/19 12:26:16 tobias Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 396,402 ****
  {
  	char rcpath[MAXPATHLEN], *buf, *lbuf, *lp, *p;
  	int i, linenum;
! 	size_t len;
  	struct cvs_cmd *cmdp;
  	FILE *fp;
  
--- 396,402 ----
  {
  	char rcpath[MAXPATHLEN], *buf, *lbuf, *lp, *p;
  	int i, linenum;
! 	size_t len, pos;
  	struct cvs_cmd *cmdp;
  	FILE *fp;
  
***************
*** 443,452 ****
  		if (*p == '#' || *p == '\t')
  			continue;
  
! 		lp = strchr(p, ' ');
! 		if (lp == NULL)
! 			continue;	/* ignore lines with no arguments */
! 		*lp = '\0';
  		if (strcmp(p, "cvs") == 0) {
  			/*
  			 * Global default options.  In the case of cvs only,
--- 443,457 ----
  		if (*p == '#' || *p == '\t')
  			continue;
  
! 		pos = strcspn(p, " \t");
! 		if (pos == strlen(p)) {
! 			/* ignore lines with no arguments */
! 			continue;
! 		} else {
! 			lp = p + pos;
! 			*lp = '\0';
! 		}
! 
  		if (strcmp(p, "cvs") == 0) {
  			/*
  			 * Global default options.  In the case of cvs only,