diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-27 19:33:22 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-27 19:33:22 +0000 |
| commit | b4d055c56d56b705a9874806044897b6f933a892 (patch) | |
| tree | ea6944e4424f24dce67f9a7422a498a2e3e97486 /usr.bin/telnet/terminal.c | |
| parent | d413353d829242c97addbbe6aace0c12d53c4772 (diff) | |
From NetBSD: merge of 960317
Diffstat (limited to 'usr.bin/telnet/terminal.c')
| -rw-r--r-- | usr.bin/telnet/terminal.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/usr.bin/telnet/terminal.c b/usr.bin/telnet/terminal.c index 01a021f5088..6d1108f009f 100644 --- a/usr.bin/telnet/terminal.c +++ b/usr.bin/telnet/terminal.c @@ -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,8 +35,12 @@ */ #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 $"; +#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,7 +148,8 @@ ttyflush(drop) n1 = n0 - n; if (!drop) n1 = TerminalWrite(ttyoring.bottom, n1); - n += n1; + if (n1 > 0) + n += n1; } ring_consumed(&ttyoring, n); } |