===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/lesskey.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/less/lesskey.c	2001/11/19 19:02:14	1.3
--- src/usr.bin/less/lesskey.c	2003/04/05 01:03:35	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: lesskey.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
  
  /*
   * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
--- 1,4 ----
! /*	$OpenBSD: lesskey.c,v 1.4 2003/04/05 01:03:35 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
***************
*** 223,237 ****
  	char *filename;
  {
  	char *pathname;
  
! 	pathname = calloc(strlen(dirname) + strlen(filename) + 2, sizeof(char));
! 	strcpy(pathname, dirname);
  #if MSOFTC || OS2
! 	strcat(pathname, "\\");
  #else
! 	strcat(pathname, "/");
  #endif
! 	strcat(pathname, filename);
  	return (pathname);
  }
  
--- 223,239 ----
  	char *filename;
  {
  	char *pathname;
+ 	size_t len;
  
! 	len = strlen(dirname) + strlen(filename) + 2;
! 	pathname = calloc(len, sizeof(char));
! 	strlcpy(pathname, dirname, len);
  #if MSOFTC || OS2
! 	strlcat(pathname, "\\", len);
  #else
! 	strlcat(pathname, "/", len);
  #endif
! 	strlcat(pathname, filename, len);
  	return (pathname);
  }