===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/str.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/make/str.c	1999/12/06 22:24:32	1.10
--- src/usr.bin/make/str.c	1999/12/09 18:18:24	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: str.c,v 1.10 1999/12/06 22:24:32 espie Exp $	*/
  /*	$NetBSD: str.c,v 1.13 1996/11/06 17:59:23 christos Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: str.c,v 1.11 1999/12/09 18:18:24 espie Exp $	*/
  /*	$NetBSD: str.c,v 1.13 1996/11/06 17:59:23 christos Exp $	*/
  
  /*-
***************
*** 43,49 ****
  #if 0
  static char     sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
  #else
! static char rcsid[] = "$OpenBSD: str.c,v 1.10 1999/12/06 22:24:32 espie Exp $";
  #endif
  #endif				/* not lint */
  
--- 43,49 ----
  #if 0
  static char     sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
  #else
! static char rcsid[] = "$OpenBSD: str.c,v 1.11 1999/12/09 18:18:24 espie Exp $";
  #endif
  #endif				/* not lint */
  
***************
*** 412,418 ****
  
      if ((m = strchr(pat, '%')) != NULL) {
  	/* Copy the prefix */
! 	Buf_AddChars(buf, m - pat, pat);
  	/* skip the % */
  	pat = m + 1;
      }
--- 412,418 ----
  
      if ((m = strchr(pat, '%')) != NULL) {
  	/* Copy the prefix */
! 	Buf_AddInterval(buf, pat, m);
  	/* skip the % */
  	pat = m + 1;
      }
***************
*** 421,427 ****
      Buf_AddChars(buf, len, src);
  
      /* append the rest */
!     Buf_AddChars(buf, strlen(pat), pat);
  }
  
  char *
--- 421,427 ----
      Buf_AddChars(buf, len, src);
  
      /* append the rest */
!     Buf_AddString(buf, pat);
  }
  
  char *