X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1c15e88899094343f75aeba04122cd96a96b428e..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/usr.bin/window/ttoutput.c

diff --git a/usr/src/usr.bin/window/ttoutput.c b/usr/src/usr.bin/window/ttoutput.c
index f117471d27..5c582d6b24 100644
--- a/usr/src/usr.bin/window/ttoutput.c
+++ b/usr/src/usr.bin/window/ttoutput.c
@@ -1,27 +1,41 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Edward Wang at The University of California, Berkeley.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)ttoutput.c	3.9 (Berkeley) 6/6/90";
+static char sccsid[] = "@(#)ttoutput.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include "ww.h"
@@ -36,9 +50,17 @@ static char sccsid[] = "@(#)ttoutput.c	3.9 (Berkeley) 6/6/90";
 ttflush()
 {
 	register char *p;
-	register n;
+	register n = tt_obp - tt_ob;
 	extern errno;
 
+	if (n == 0)
+		return;
+	if (tt.tt_checksum)
+		(*tt.tt_checksum)(tt_ob, n);
+	if (tt.tt_flush) {
+		(*tt.tt_flush)();
+		return;
+	}
 	wwnflush++;
 	for (p = tt_ob; p < tt_obp;) {
 		wwnwr++;
@@ -79,20 +101,20 @@ ttwrite(s, n)
 		break;
 	case 2:
 		if (tt_obe - tt_obp < 2)
-			(*tt.tt_flush)();
+			ttflush();
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s;
 		break;
 	case 3:
 		if (tt_obe - tt_obp < 3)
-			(*tt.tt_flush)();
+			ttflush();
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s;
 		break;
 	case 4:
 		if (tt_obe - tt_obp < 4)
-			(*tt.tt_flush)();
+			ttflush();
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s++;
@@ -100,7 +122,7 @@ ttwrite(s, n)
 		break;
 	case 5:
 		if (tt_obe - tt_obp < 5)
-			(*tt.tt_flush)();
+			ttflush();
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s++;
 		*tt_obp++ = *s++;
@@ -112,7 +134,7 @@ ttwrite(s, n)
 			register m;
 
 			while ((m = tt_obe - tt_obp) == 0)
-				(*tt.tt_flush)();
+				ttflush();
 			if ((m = tt_obe - tt_obp) > n)
 				m = n;
 			bcopy(s, tt_obp, m);