===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/xinstall/xinstall.c	2004/10/04 05:21:27	1.42
--- src/usr.bin/xinstall/xinstall.c	2006/01/10 00:30:08	1.43
***************
*** 1,4 ****
! /*	$OpenBSD: xinstall.c,v 1.42 2004/10/04 05:21:27 jsg Exp $	*/
  /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: xinstall.c,v 1.43 2006/01/10 00:30:08 millert Exp $	*/
  /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
  #endif
! static char rcsid[] = "$OpenBSD: xinstall.c,v 1.42 2004/10/04 05:21:27 jsg Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
  #endif
! static char rcsid[] = "$OpenBSD: xinstall.c,v 1.43 2006/01/10 00:30:08 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 615,628 ****
  {
  	char *p;
  
! 	(void)strncpy(temp, path, tsize);
! 	temp[tsize - 1] = '\0';
! 	if ((p = strrchr(temp, '/')))
  		p++;
  	else
  		p = temp;
! 	(void)strncpy(p, "INS@XXXXXXXXXX", &temp[tsize - 1] - p);
! 	temp[tsize - 1] = '\0';
  
  	return(mkstemp(temp));
  }
--- 615,627 ----
  {
  	char *p;
  
! 	strlcpy(temp, path, tsize);
! 	if ((p = strrchr(temp, '/')) != NULL)
  		p++;
  	else
  		p = temp;
! 	*p = '\0';
! 	strlcat(p, "INS@XXXXXXXXXX", tsize);
  
  	return(mkstemp(temp));
  }