===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/for.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/make/for.c	2013/11/01 17:54:37	1.44
--- src/usr.bin/make/for.c	2013/11/22 15:47:35	1.45
***************
*** 1,4 ****
! /*	$OpenBSD: for.c,v 1.44 2013/11/01 17:54:37 espie Exp $	*/
  /*	$NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */
  
  /*
--- 1,4 ----
! /*	$OpenBSD: for.c,v 1.45 2013/11/22 15:47:35 espie Exp $	*/
  /*	$NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */
  
  /*
***************
*** 138,144 ****
  	For 	*arg;
  	unsigned long n;
  
! 	while (isspace(*ptr))
  		ptr++;
  
  	/* Parse loop.  */
--- 138,144 ----
  	For 	*arg;
  	unsigned long n;
  
! 	while (ISSPACE(*ptr))
  		ptr++;
  
  	/* Parse loop.  */
***************
*** 149,162 ****
  
  	for (;;) {
  		/* Grab the variables.  */
! 		for (wrd = ptr; *ptr && !isspace(*ptr); ptr++)
  			continue;
  		if (ptr - wrd == 0) {
  			Parse_Error(PARSE_FATAL, "Syntax error in for");
  			return 0;
  		}
  		endVar = ptr++;
! 		while (isspace(*ptr))
  			ptr++;
  		/* End of variable list ? */
  		if (endVar - wrd == 2 && wrd[0] == 'i' && wrd[1] == 'n')
--- 149,162 ----
  
  	for (;;) {
  		/* Grab the variables.  */
! 		for (wrd = ptr; *ptr && !ISSPACE(*ptr); ptr++)
  			continue;
  		if (ptr - wrd == 0) {
  			Parse_Error(PARSE_FATAL, "Syntax error in for");
  			return 0;
  		}
  		endVar = ptr++;
! 		while (ISSPACE(*ptr))
  			ptr++;
  		/* End of variable list ? */
  		if (endVar - wrd == 2 && wrd[0] == 'i' && wrd[1] == 'n')
***************
*** 214,224 ****
  
  	if (*ptr == '.') {
  
! 		for (ptr++; isspace(*ptr); ptr++)
  			continue;
  
  		if (strncmp(ptr, "endfor", 6) == 0 &&
! 		    (isspace(ptr[6]) || !ptr[6])) {
  			if (DEBUG(FOR))
  				(void)fprintf(stderr, "For: end for %lu\n",
  				    arg->level);
--- 214,224 ----
  
  	if (*ptr == '.') {
  
! 		for (ptr++; ISSPACE(*ptr); ptr++)
  			continue;
  
  		if (strncmp(ptr, "endfor", 6) == 0 &&
! 		    (ISSPACE(ptr[6]) || !ptr[6])) {
  			if (DEBUG(FOR))
  				(void)fprintf(stderr, "For: end for %lu\n",
  				    arg->level);
***************
*** 227,233 ****
  				return false;
  		}
  		else if (strncmp(ptr, "for", 3) == 0 &&
! 		     isspace(ptr[3])) {
  			arg->level++;
  			if (DEBUG(FOR))
  				(void)fprintf(stderr, "For: new loop %lu\n",
--- 227,233 ----
  				return false;
  		}
  		else if (strncmp(ptr, "for", 3) == 0 &&
! 		     ISSPACE(ptr[3])) {
  			arg->level++;
  			if (DEBUG(FOR))
  				(void)fprintf(stderr, "For: new loop %lu\n",