Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Fix a bug in ptcread() that stopped a pty(4) in TIO...



details:   https://anonhg.NetBSD.org/src/rev/f500df68695f
branches:  trunk
changeset: 758826:f500df68695f
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Nov 16 23:58:11 2010 +0000

description:
Fix a bug in ptcread() that stopped a pty(4) in TIOCPKT_IOCTL mode from
sending a termios(4) structure like it was supposed to: ptcread() used
to copy pti->pt_send and zero it before testing it for TIOCPKT_IOCTL.
Test for TIOCPKT_IOCTL in the pti->pt_send copy in local variable c
instead of in pti->pt_send itself.

diffstat:

 sys/kern/tty_pty.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 57728efc2951 -r f500df68695f sys/kern/tty_pty.c
--- a/sys/kern/tty_pty.c        Tue Nov 16 20:08:24 2010 +0000
+++ b/sys/kern/tty_pty.c        Tue Nov 16 23:58:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty_pty.c,v 1.123 2010/09/05 18:03:37 dyoung Exp $     */
+/*     $NetBSD: tty_pty.c,v 1.124 2010/11/16 23:58:11 dyoung Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.123 2010/09/05 18:03:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.124 2010/11/16 23:58:11 dyoung Exp $");
 
 #include "opt_ptm.h"
 
@@ -615,7 +615,7 @@
                                 * relevant only if the tty got closed and then
                                 * opened again while we were out uiomoving.
                                 */
-                               if (pti->pt_send & TIOCPKT_IOCTL) {
+                               if (c & TIOCPKT_IOCTL) {
                                        cc = min(uio->uio_resid,
                                                sizeof(tp->t_termios));
                                        uiomove((void *) &tp->t_termios,



Home | Main Index | Thread Index | Old Index