 @@ -1,14 +1,14 @@
-/*	$NetBSD: tty_pty.c,v 1.129 2011/07/26 13:14:18 yamt Exp $	*/
+/*	$NetBSD: tty_pty.c,v 1.130 2011/09/23 23:57:06 christos Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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.
+ *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
  */
 /*
  * Pseudo-teletype Driver
  * (Actually two drivers, requiring two entries in 'cdevsw')
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.129 2011/07/26 13:14:18 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.130 2011/09/23 23:57:06 christos Exp $");
 #include "opt_ptm.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/ioctl_compat.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 @@ -691,90 +691,94 @@ ptcwrite(dev_t dev, struct uio *uio, int
 	u_char *cp = NULL;
 	int cc = 0;
 	u_char locbuf[BUFSIZ];
 	int cnt = 0;
 	int error = 0;
 again:
 	mutex_spin_enter(&tty_lock);
 	if (!ISSET(tp->t_state, TS_ISOPEN))
 		goto block;
 	if (pti->pt_flags & PF_REMOTE) {
 		if (tp->t_canq.c_cc)
 			goto block;
-		while (uio->uio_resid > 0 && tp->t_canq.c_cc < TTYHOG - 1) {
+		while (uio->uio_resid > 0 && tp->t_canq.c_cc < TTYHOG) {
 			if (cc == 0) {
 				cc = min(uio->uio_resid, BUFSIZ);
 				cc = min(cc, TTYHOG - 1 - tp->t_canq.c_cc);
 				cp = locbuf;
 				mutex_spin_exit(&tty_lock);
 				error = uiomove((void *)cp, cc, uio);
 				if (error != 0)
 					return error;
 				mutex_spin_enter(&tty_lock);
 				/* check again for safety */
 				if (!ISSET(tp->t_state, TS_ISOPEN)) {
 					/*
 					 * adjust for data copied in but not
 					 * written
 					 */
 					uio->uio_resid += cc;
 					error = EIO;
 					goto out;
 			if (cc)
 				(void) b_to_q(cp, cc, &tp->t_canq);
 			cc = 0;
 		(void) putc(0, &tp->t_canq);
 		ttwakeup(tp);
 		cv_broadcast(&tp->t_cancv);
 		error = 0;
 		goto out;
 	while (uio->uio_resid > 0) {
 		if (cc == 0) {
 			cc = min(uio->uio_resid, BUFSIZ);
 			cc = min(cc, TTYHOG - tp->t_canq.c_cc);
 			cp = locbuf;
 			mutex_spin_exit(&tty_lock);
-			error = uiomove((void *)cp, cc, uio);
+			error = uiomove(cp, cc, uio);
 			if (error != 0)
 				return error;
 			mutex_spin_enter(&tty_lock);
 			/* check again for safety */
 			if (!ISSET(tp->t_state, TS_ISOPEN)) {
-				/* adjust for data copied in but not written */
+				/*
 				 * adjust for data copied in but not
 				 * written
 				 */
 				uio->uio_resid += cc;
 				error = EIO;
 				goto out;
+			}
 			if (cc) {
 				cc = b_to_q(cp, cc, &tp->t_outq);
 				if (cc > 0)
 					goto block;
+			}
+		}
 		(void) putc(0, &tp->t_canq);
 		ttwakeup(tp);
 		cv_broadcast(&tp->t_cancv);
 		error = 0;
 		goto out;
+	}
 	while (uio->uio_resid > 0) {
 		cc = min(uio->uio_resid, BUFSIZ);
 		cp = locbuf;
 		mutex_spin_exit(&tty_lock);
 		error = uiomove(cp, cc, uio);
 		if (error != 0)
 			return error;
 		mutex_spin_enter(&tty_lock);
 		/* check again for safety */
 		if (!ISSET(tp->t_state, TS_ISOPEN)) {
 			/* adjust for data copied in but not written */
 			uio->uio_resid += cc;
 			error = EIO;
 			goto out;
+		}
 		while (cc > 0) {
-			if ((tp->t_rawq.c_cc + tp->t_canq.c_cc) >= TTYHOG - 2 &&
+			int used = tp->t_rawq.c_cc + tp->t_canq.c_cc;
-			   (tp->t_canq.c_cc > 0 || !ISSET(tp->t_lflag, ICANON))) {
+			int canon = ISSET(tp->t_lflag, ICANON) ? 1 : 0;
 			/*
 			 * We need space for 2 characters if canonical
 			 * because we might need to print ^C
 			 */
 			if (used >= (TTYHOG - canon) &&
 			   (tp->t_canq.c_cc > 0 || !canon)) {
 				cv_broadcast(&tp->t_rawcv);
 				goto block;
+			}
-			/* XXX - should change l_rint to be called with lock
+			/*
 			 * XXX - should change l_rint to be called with lock
 			 *	 see also tty.c:ttyinput_wlock()
 			 */
 			mutex_spin_exit(&tty_lock);
 			(*tp->t_linesw->l_rint)(*cp++, tp);
 			mutex_spin_enter(&tty_lock);
 			cnt++;
 			cc--;
+		}
 		cc = 0;
+	}
 	error = 0;
 	goto out;
 block:
 	/*
 	 * Come here to wait for slave to open, for space
 	 * in outq, or space in rawq.
 	 */
 	if (!ISSET(tp->t_state, TS_CARR_ON)) {
 		/* adjust for data copied in but not written */
 		uio->uio_resid += cc;
 		error = EIO;