===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/server.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/cvs/server.c	2006/11/27 16:04:10	1.40
--- src/usr.bin/cvs/server.c	2006/12/04 09:51:21	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: server.c,v 1.40 2006/11/27 16:04:10 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: server.c,v 1.41 2006/12/04 09:51:21 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 305,311 ****
  cvs_server_modified(char *data)
  {
  	BUF *bp;
! 	int fd, l;
  	size_t flen;
  	mode_t fmode;
  	const char *errstr;
--- 305,311 ----
  cvs_server_modified(char *data)
  {
  	BUF *bp;
! 	int fd;
  	size_t flen;
  	mode_t fmode;
  	const char *errstr;
***************
*** 325,333 ****
  	bp = cvs_remote_receive_file(flen);
  
  	fpath = xmalloc(MAXPATHLEN);
! 	l = snprintf(fpath, MAXPATHLEN, "%s/%s", server_currentdir, data);
! 	if (l == -1 || l >= MAXPATHLEN)
! 		fatal("cvs_server_modified: overflow");
  
  	if ((fd = open(fpath, O_WRONLY | O_CREAT | O_TRUNC)) == -1)
  		fatal("cvs_server_modified: %s: %s", fpath, strerror(errno));
--- 325,333 ----
  	bp = cvs_remote_receive_file(flen);
  
  	fpath = xmalloc(MAXPATHLEN);
! 	if (cvs_path_cat(server_currentdir, data, fpath, MAXPATHLEN) >=
! 	    MAXPATHLEN)
! 		fatal("cvs_server_modified: truncation");
  
  	if ((fd = open(fpath, O_WRONLY | O_CREAT | O_TRUNC)) == -1)
  		fatal("cvs_server_modified: %s: %s", fpath, strerror(errno));
***************
*** 351,366 ****
  void
  cvs_server_unchanged(char *data)
  {
! 	int l, fd;
  	char *fpath;
  	CVSENTRIES *entlist;
  	struct cvs_ent *ent;
  	struct timeval tv[2];
  
  	fpath = xmalloc(MAXPATHLEN);
! 	l = snprintf(fpath, MAXPATHLEN, "%s/%s", server_currentdir, data);
! 	if (l == -1 || l >= MAXPATHLEN)
! 		fatal("cvs_server_unchanged: overflow");
  
  	if ((fd = open(fpath, O_RDWR | O_CREAT | O_TRUNC)) == -1)
  		fatal("cvs_server_unchanged: %s: %s", fpath, strerror(errno));
--- 351,366 ----
  void
  cvs_server_unchanged(char *data)
  {
! 	int fd;
  	char *fpath;
  	CVSENTRIES *entlist;
  	struct cvs_ent *ent;
  	struct timeval tv[2];
  
  	fpath = xmalloc(MAXPATHLEN);
! 	if (cvs_path_cat(server_currentdir, data, fpath, MAXPATHLEN) >=
! 	    MAXPATHLEN)
! 		fatal("cvs_server_unchanged: truncation");
  
  	if ((fd = open(fpath, O_RDWR | O_CREAT | O_TRUNC)) == -1)
  		fatal("cvs_server_unchanged: %s: %s", fpath, strerror(errno));