===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tftp/tftp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tftp/tftp.c	2006/07/12 16:58:51	1.17
--- src/usr.bin/tftp/tftp.c	2006/07/20 09:42:44	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: tftp.c,v 1.17 2006/07/12 16:58:51 mglocker Exp $	*/
  /*	$NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: tftp.c,v 1.18 2006/07/20 09:42:44 mglocker Exp $	*/
  /*	$NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $	*/
  
  /*
***************
*** 35,41 ****
  static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
  #endif
  static const char rcsid[] =
!     "$OpenBSD: tftp.c,v 1.17 2006/07/12 16:58:51 mglocker Exp $";
  #endif /* not lint */
  
  /*
--- 35,41 ----
  static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
  #endif
  static const char rcsid[] =
!     "$OpenBSD: tftp.c,v 1.18 2006/07/20 09:42:44 mglocker Exp $";
  #endif /* not lint */
  
  /*
***************
*** 127,133 ****
  		if (!block)
  			size = makerequest(WRQ, name, dp, mode) - 4;
  		else {
! 			size = readit(file, &dp, convert);
  			if (size < 0) {
  				nak(errno + 100);
  				break;
--- 127,133 ----
  		if (!block)
  			size = makerequest(WRQ, name, dp, mode) - 4;
  		else {
! 			size = readit(file, &dp, convert, SEGSIZE);
  			if (size < 0) {
  				nak(errno + 100);
  				break;
***************
*** 152,158 ****
  					warn("sendto");
  					goto abort;
  				}
! 				read_ahead(file, convert);
  			}
  			error = 0;
  
--- 152,158 ----
  					warn("sendto");
  					goto abort;
  				}
! 				read_ahead(file, convert, SEGSIZE);
  			}
  			error = 0;