===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -c -r1.273 -r1.274
*** src/usr.bin/cvs/file.c	2017/06/01 08:38:56	1.273
--- src/usr.bin/cvs/file.c	2020/10/19 19:51:20	1.274
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.273 2017/06/01 08:38:56 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.274 2020/10/19 19:51:20 naddy Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 265,271 ****
  	struct stat st;
  	struct cvs_file *cf;
  	struct cvs_filelist *l, *nxt;
! 	char *d, *f, repo[PATH_MAX], fpath[PATH_MAX];
  
  	for (l = RB_MIN(cvs_flisthead, fl); l != NULL; l = nxt) {
  		if (cvs_quit)
--- 265,272 ----
  	struct stat st;
  	struct cvs_file *cf;
  	struct cvs_filelist *l, *nxt;
! 	char *d, dbuf[PATH_MAX], *f, fbuf[PATH_MAX];
! 	char repo[PATH_MAX], fpath[PATH_MAX];
  
  	for (l = RB_MIN(cvs_flisthead, fl); l != NULL; l = nxt) {
  		if (cvs_quit)
***************
*** 274,282 ****
  		cvs_log(LP_TRACE, "cvs_file_walklist: element '%s'",
  		    l->file_path);
  
! 		if ((f = basename(l->file_path)) == NULL)
  			fatal("cvs_file_walklist: basename failed");
! 		if ((d = dirname(l->file_path)) == NULL)
  			fatal("cvs_file_walklist: dirname failed");
  
  		type = l->type;
--- 275,288 ----
  		cvs_log(LP_TRACE, "cvs_file_walklist: element '%s'",
  		    l->file_path);
  
! 		if (strlcpy(fbuf, l->file_path, sizeof(fbuf)) >= sizeof(fbuf))
! 			fatal("cvs_file_walklist: truncation");
! 		if ((f = basename(fbuf)) == NULL)
  			fatal("cvs_file_walklist: basename failed");
! 
! 		if (strlcpy(dbuf, l->file_path, sizeof(dbuf)) >= sizeof(dbuf))
! 			fatal("cvs_file_walklist: truncation");
! 		if ((d = dirname(dbuf)) == NULL)
  			fatal("cvs_file_walklist: dirname failed");
  
  		type = l->type;