===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/make/var.c	1999/12/16 16:41:42	1.21
--- src/usr.bin/make/var.c	1999/12/16 16:52:11	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: var.c,v 1.21 1999/12/16 16:41:42 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: var.c,v 1.22 1999/12/16 16:52:11 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
***************
*** 70,76 ****
  #if 0
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: var.c,v 1.21 1999/12/16 16:41:42 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 70,76 ----
  #if 0
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: var.c,v 1.22 1999/12/16 16:52:11 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 1278,1284 ****
  
      free(as);
      free(av);
-     Buf_AddChar(buf, '\0');
      str = Buf_Retrieve(buf);
      Buf_Destroy(buf, FALSE);
      return (str);
--- 1278,1283 ----
***************
*** 1369,1376 ****
  	    Buf_AddChar(buf, *cp);
      }
  
-     Buf_AddChar(buf, '\0');
- 
      if (*cp != delim) {
  	*tstr = cp;
  	*length = 0;
--- 1368,1373 ----
***************
*** 1380,1386 ****
  	*tstr = ++cp;
  	cp = Buf_Retrieve(buf);
  	*length = Buf_Size(buf);
- 	*length -= 1;	/* Don't count the NULL */
  	Buf_Destroy(buf, FALSE);
  	return cp;
      }
--- 1377,1382 ----
***************
*** 1414,1420 ****
  	    Buf_AddChar(buf, '\\');
  	Buf_AddChar(buf, *str);
      }
-     Buf_AddChar(buf, '\0');
      str = Buf_Retrieve(buf);
      Buf_Destroy(buf, FALSE);
      return str;
--- 1410,1415 ----
***************
*** 2257,2263 ****
  	}
      }
  
-     Buf_AddChar(buf, '\0');
      str = Buf_Retrieve(buf);
      Buf_Destroy(buf, FALSE);
      return (str);
--- 2252,2257 ----