===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/make/var.c	2001/05/03 13:41:13	1.53
--- src/usr.bin/make/var.c	2001/05/15 13:31:03	1.54
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: var.c,v 1.53 2001/05/03 13:41:13 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: var.c,v 1.54 2001/05/15 13:31:03 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
***************
*** 128,134 ****
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
  UNUSED
! static char rcsid[] = "$OpenBSD: var.c,v 1.53 2001/05/03 13:41:13 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 128,134 ----
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
  UNUSED
! static char rcsid[] = "$OpenBSD: var.c,v 1.54 2001/05/15 13:31:03 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 968,974 ****
  	/* Find eventual modifiers in the variable */
  	tstr = Var_Name_Get(str, &name, ctxt, FALSE, find_pos(endc));
  	Var_Name_Free(&name);
! 	length = tstr+1 - start;
      }
  
      if (result != NULL)
--- 968,977 ----
  	/* Find eventual modifiers in the variable */
  	tstr = Var_Name_Get(str, &name, ctxt, FALSE, find_pos(endc));
  	Var_Name_Free(&name);
! 	length = tstr - start;
! 	/* Terminated correctly */
! 	if (*tstr != '\0')
! 		length++;
      }
  
      if (result != NULL)
***************
*** 1070,1076 ****
  
  	/* Find eventual modifiers in the variable */
  	tstr = Var_Name_Get(str, &name, ctxt, FALSE, find_pos(endc));
! 	*lengthPtr = tstr+1 - start;
      }
  
      idx = quick_lookup(name.s, &name.e, &k);
--- 1073,1081 ----
  
  	/* Find eventual modifiers in the variable */
  	tstr = Var_Name_Get(str, &name, ctxt, FALSE, find_pos(endc));
! 	*lengthPtr = tstr - start;
! 	if (*tstr != '\0')
! 		(*lengthPtr)++;
      }
  
      idx = quick_lookup(name.s, &name.e, &k);