===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/terminal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/telnet/terminal.c	1995/10/18 08:46:15	1.1
--- src/usr.bin/telnet/terminal.c	1996/03/27 19:33:11	1.2
***************
*** 1,3 ****
--- 1,6 ----
+ /*	$OpenBSD: terminal.c,v 1.2 1996/03/27 19:33:11 niklas Exp $	*/
+ /*	$NetBSD: terminal.c,v 1.5 1996/02/28 21:04:17 thorpej Exp $	*/
+ 
  /*
   * Copyright (c) 1988, 1990, 1993
   *	The Regents of the University of California.  All rights reserved.
***************
*** 32,39 ****
   */
  
  #ifndef lint
! /* from: static char sccsid[] = "@(#)terminal.c	8.1 (Berkeley) 6/6/93"; */
! static char *rcsid = "$Id: terminal.c,v 1.1 1995/10/18 08:46:15 deraadt Exp $";
  #endif /* not lint */
  
  #include <arpa/telnet.h>
--- 35,46 ----
   */
  
  #ifndef lint
! #if 0
! static char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
! static char rcsid[] = "$NetBSD: terminal.c,v 1.5 1996/02/28 21:04:17 thorpej Exp $";
! #else
! static char rcsid[] = "$OpenBSD: terminal.c,v 1.2 1996/03/27 19:33:11 niklas Exp $";
! #endif
  #endif /* not lint */
  
  #include <arpa/telnet.h>
***************
*** 141,147 ****
  		n1 = n0 - n;
  		if (!drop)
  			n1 = TerminalWrite(ttyoring.bottom, n1);
! 		n += n1;
  	}
  	ring_consumed(&ttyoring, n);
      }
--- 148,155 ----
  		n1 = n0 - n;
  		if (!drop)
  			n1 = TerminalWrite(ttyoring.bottom, n1);
! 		if (n1 > 0)
! 			n += n1;
  	}
  	ring_consumed(&ttyoring, n);
      }