From a317bc2c36ce71947593cb2e833b1a1b34285d3a Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 1 Nov 1995 15:59:55 +0000
Subject: [PATCH] Clean up the previous commit I did on this file.

The Jury has not reached a verdict yet on this approach - a better fix
may be thought of, but for now this works.
---
 sys/kern/subr_clist.c | 14 +++++++++-----
 sys/kern/tty_subr.c   | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 9123397de0d4..1855e17c3481 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: tty_subr.c,v 1.14 1995/10/25 17:59:58 bde Exp $
+ * $Id: tty_subr.c,v 1.15 1995/10/31 19:00:00 peter Exp $
  */
 
 /*
@@ -351,10 +351,12 @@ putc(chr, clistp)
 	if (clistp->c_cl == NULL) {
 		if (clistp->c_cbreserved < 1) {
 			splx(s);
+			printf("putc to a clist with no reserved cblocks: data discarded.\n");
 #ifdef DIAGNOSTIC
-			printf("putc to a clist with no reserved cblocks");
+			Debugger("putc to clist with no reserved cblocks");
 #endif
-			return (-1);
+			/* black-hole the character */
+			return (0);
 		}
 		cblockp = cblock_alloc();
 		clistp->c_cbcount = 1;
@@ -432,10 +434,12 @@ b_to_q(src, amount, clistp)
 	if (clistp->c_cl == NULL) {
 		if (clistp->c_cbreserved < 1) {
 			splx(s);
+			printf("b_to_q to a clist with no reserved cblocks: data discarded.\n");
 #ifdef DIAGNOSTIC
-			printf("b_to_q to a clist with no reserved cblocks");
+			Debugger("b_to_q to clist with no reserved cblocks");
 #endif
-			return (amount);
+			/* black-hole the characters */
+			return (0);
 		}
 		cblockp = cblock_alloc();
 		clistp->c_cbcount = 1;
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 9123397de0d4..1855e17c3481 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: tty_subr.c,v 1.14 1995/10/25 17:59:58 bde Exp $
+ * $Id: tty_subr.c,v 1.15 1995/10/31 19:00:00 peter Exp $
  */
 
 /*
@@ -351,10 +351,12 @@ putc(chr, clistp)
 	if (clistp->c_cl == NULL) {
 		if (clistp->c_cbreserved < 1) {
 			splx(s);
+			printf("putc to a clist with no reserved cblocks: data discarded.\n");
 #ifdef DIAGNOSTIC
-			printf("putc to a clist with no reserved cblocks");
+			Debugger("putc to clist with no reserved cblocks");
 #endif
-			return (-1);
+			/* black-hole the character */
+			return (0);
 		}
 		cblockp = cblock_alloc();
 		clistp->c_cbcount = 1;
@@ -432,10 +434,12 @@ b_to_q(src, amount, clistp)
 	if (clistp->c_cl == NULL) {
 		if (clistp->c_cbreserved < 1) {
 			splx(s);
+			printf("b_to_q to a clist with no reserved cblocks: data discarded.\n");
 #ifdef DIAGNOSTIC
-			printf("b_to_q to a clist with no reserved cblocks");
+			Debugger("b_to_q to clist with no reserved cblocks");
 #endif
-			return (amount);
+			/* black-hole the characters */
+			return (0);
 		}
 		cblockp = cblock_alloc();
 		clistp->c_cbcount = 1;