===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/remote.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/cvs/remote.c	2007/01/18 16:45:52	1.7
--- src/usr.bin/cvs/remote.c	2007/01/24 21:24:48	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: remote.c,v 1.7 2007/01/18 16:45:52 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: remote.c,v 1.8 2007/01/24 21:24:48 otto Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 141,147 ****
  
  		nwrite = write(fd, data, nread);
  		if (nwrite != nread)
! 			fatal("failed to write %ld bytes", nread);
  
  		if (cvs_server_active == 0 &&
  		    cvs_client_outlog_fd != -1)
--- 141,147 ----
  
  		nwrite = write(fd, data, nread);
  		if (nwrite != nread)
! 			fatal("failed to write %zu bytes", nread);
  
  		if (cvs_server_active == 0 &&
  		    cvs_client_outlog_fd != -1)
***************
*** 158,164 ****
  {
  	int l, fd;
  	FILE *out, *in;
! 	size_t ret, rw, total;
  	struct stat st;
  	char buf[16], *data;
  
--- 158,165 ----
  {
  	int l, fd;
  	FILE *out, *in;
! 	size_t ret, rw;
! 	off_t total;
  	struct stat st;
  	char buf[16], *data;
  
***************
*** 189,195 ****
  	while ((ret = fread(data, sizeof(char), MAXBSIZE, in)) != 0) {
  		rw = fwrite(data, sizeof(char), ret, out);
  		if (rw != ret)
! 			fatal("failed to write %ld bytes", ret);
  
  		if (cvs_server_active == 0 &&
  		    cvs_client_outlog_fd != -1)
--- 190,196 ----
  	while ((ret = fread(data, sizeof(char), MAXBSIZE, in)) != 0) {
  		rw = fwrite(data, sizeof(char), ret, out);
  		if (rw != ret)
! 			fatal("failed to write %zu bytes", ret);
  
  		if (cvs_server_active == 0 &&
  		    cvs_client_outlog_fd != -1)
***************
*** 201,207 ****
  	xfree(data);
  
  	if (total != st.st_size)
! 		fatal("length mismatch, %ld vs %ld", total, st.st_size);
  
  	(void)fclose(in);
  }
--- 202,208 ----
  	xfree(data);
  
  	if (total != st.st_size)
! 		fatal("length mismatch, %lld vs %lld", total, st.st_size);
  
  	(void)fclose(in);
  }