33c33
< __FBSDID("$FreeBSD: head/sys/kern/tty_pty.c 130262 2004-06-09 10:16:14Z phk $");
---
> __FBSDID("$FreeBSD: head/sys/kern/tty_pty.c 130263 2004-06-09 10:21:53Z phk $");
106c106
< struct pt_ioctl {
---
> struct ptsc {
140c140
< struct pt_ioctl *pt;
---
> struct ptsc *pt;
168c168
< struct pt_ioctl *pti;
---
> struct ptsc *pt;
172c172
< pti = dev->si_drv1;
---
> pt = dev->si_drv1;
183c183
< else if (pti->pt_prison != td->td_ucred->cr_prison)
---
> else if (pt->pt_prison != td->td_ucred->cr_prison)
219c219
< struct pt_ioctl *pti = dev->si_drv1;
---
> struct ptsc *pt = dev->si_drv1;
224c224
< if (pti->pt_flags & PF_REMOTE) {
---
> if (pt->pt_flags & PF_REMOTE) {
294c294
< struct pt_ioctl *pti = tp->t_dev->si_drv1;
---
> struct ptsc *pt = tp->t_dev->si_drv1;
298,300c298,300
< if (pti->pt_flags & PF_STOPPED) {
< pti->pt_flags &= ~PF_STOPPED;
< pti->pt_send = TIOCPKT_START;
---
> if (pt->pt_flags & PF_STOPPED) {
> pt->pt_flags &= ~PF_STOPPED;
> pt->pt_send = TIOCPKT_START;
308c308
< struct pt_ioctl *pti = tp->t_dev->si_drv1;
---
> struct ptsc *pt = tp->t_dev->si_drv1;
311c311
< selwakeuppri(&pti->pt_selr, TTIPRI);
---
> selwakeuppri(&pt->pt_selr, TTIPRI);
315c315
< selwakeuppri(&pti->pt_selw, TTOPRI);
---
> selwakeuppri(&pt->pt_selw, TTOPRI);
324c324
< struct pt_ioctl *pti;
---
> struct ptsc *pt;
338,342c338,342
< pti = dev->si_drv1;
< pti->pt_prison = td->td_ucred->cr_prison;
< pti->pt_flags = 0;
< pti->pt_send = 0;
< pti->pt_ucntl = 0;
---
> pt = dev->si_drv1;
> pt->pt_prison = td->td_ucred->cr_prison;
> pt->pt_flags = 0;
> pt->pt_send = 0;
> pt->pt_ucntl = 0;
376c376
< struct pt_ioctl *pti = dev->si_drv1;
---
> struct ptsc *pt = dev->si_drv1;
388,389c388,389
< if (pti->pt_flags&PF_PKT && pti->pt_send) {
< error = ureadc((int)pti->pt_send, uio);
---
> if (pt->pt_flags&PF_PKT && pt->pt_send) {
> error = ureadc((int)pt->pt_send, uio);
392c392
< if (pti->pt_send & TIOCPKT_IOCTL) {
---
> if (pt->pt_send & TIOCPKT_IOCTL) {
397c397
< pti->pt_send = 0;
---
> pt->pt_send = 0;
400,401c400,401
< if (pti->pt_flags&PF_UCNTL && pti->pt_ucntl) {
< error = ureadc((int)pti->pt_ucntl, uio);
---
> if (pt->pt_flags&PF_UCNTL && pt->pt_ucntl) {
> error = ureadc((int)pt->pt_ucntl, uio);
404c404
< pti->pt_ucntl = 0;
---
> pt->pt_ucntl = 0;
418c418
< if (pti->pt_flags & (PF_PKT|PF_UCNTL))
---
> if (pt->pt_flags & (PF_PKT|PF_UCNTL))
433c433
< struct pt_ioctl *pti = tp->t_dev->si_drv1;
---
> struct ptsc *pt = tp->t_dev->si_drv1;
439c439
< pti->pt_flags |= PF_STOPPED;
---
> pt->pt_flags |= PF_STOPPED;
441,442c441,442
< pti->pt_flags &= ~PF_STOPPED;
< pti->pt_send |= flush;
---
> pt->pt_flags &= ~PF_STOPPED;
> pt->pt_send |= flush;
456c456
< struct pt_ioctl *pti = dev->si_drv1;
---
> struct ptsc *pt = dev->si_drv1;
472,473c472,473
< ((pti->pt_flags & PF_PKT) && pti->pt_send) ||
< ((pti->pt_flags & PF_UCNTL) && pti->pt_ucntl)))
---
> ((pt->pt_flags & PF_PKT) && pt->pt_send) ||
> ((pt->pt_flags & PF_UCNTL) && pt->pt_ucntl)))
478c478
< ((pti->pt_flags & PF_REMOTE) ?
---
> ((pt->pt_flags & PF_REMOTE) ?
490c490
< selrecord(td, &pti->pt_selr);
---
> selrecord(td, &pt->pt_selr);
493c493
< selrecord(td, &pti->pt_selw);
---
> selrecord(td, &pt->pt_selw);
508c508
< struct pt_ioctl *pti = dev->si_drv1;
---
> struct ptsc *pt = dev->si_drv1;
514c514
< if (pti->pt_flags & PF_REMOTE) {
---
> if (pt->pt_flags & PF_REMOTE) {
612c612
< struct pt_ioctl *pti = dev->si_drv1;
---
> struct ptsc *pt = dev->si_drv1;
629c629
< if (pti->pt_flags & PF_UCNTL)
---
> if (pt->pt_flags & PF_UCNTL)
631c631
< pti->pt_flags |= PF_PKT;
---
> pt->pt_flags |= PF_PKT;
633c633
< pti->pt_flags &= ~PF_PKT;
---
> pt->pt_flags &= ~PF_PKT;
638c638
< if (pti->pt_flags & PF_PKT)
---
> if (pt->pt_flags & PF_PKT)
640c640
< pti->pt_flags |= PF_UCNTL;
---
> pt->pt_flags |= PF_UCNTL;
642c642
< pti->pt_flags &= ~PF_UCNTL;
---
> pt->pt_flags &= ~PF_UCNTL;
647c647
< pti->pt_flags |= PF_REMOTE;
---
> pt->pt_flags |= PF_REMOTE;
649c649
< pti->pt_flags &= ~PF_REMOTE;
---
> pt->pt_flags &= ~PF_REMOTE;
702,703c702,703
< if (pti->pt_flags & PF_PKT) {
< pti->pt_send |= TIOCPKT_IOCTL;
---
> if (pt->pt_flags & PF_PKT) {
> pt->pt_send |= TIOCPKT_IOCTL;
709,710c709,710
< (pti->pt_flags & PF_PKT)) {
< pti->pt_send |= TIOCPKT_IOCTL;
---
> (pt->pt_flags & PF_PKT)) {
> pt->pt_send |= TIOCPKT_IOCTL;
719c719
< if (pti->pt_flags & PF_UCNTL &&
---
> if (pt->pt_flags & PF_UCNTL &&
722c722
< pti->pt_ucntl = (u_char)cmd;
---
> pt->pt_ucntl = (u_char)cmd;
732c732
< if ((tp->t_lflag&EXTPROC) && (pti->pt_flags & PF_PKT)) {
---
> if ((tp->t_lflag&EXTPROC) && (pt->pt_flags & PF_PKT)) {
748c748
< pti->pt_send |= TIOCPKT_IOCTL;
---
> pt->pt_send |= TIOCPKT_IOCTL;
757c757
< if (pti->pt_flags & PF_NOSTOP) {
---
> if (pt->pt_flags & PF_NOSTOP) {
759,761c759,761
< pti->pt_send &= ~TIOCPKT_NOSTOP;
< pti->pt_send |= TIOCPKT_DOSTOP;
< pti->pt_flags &= ~PF_NOSTOP;
---
> pt->pt_send &= ~TIOCPKT_NOSTOP;
> pt->pt_send |= TIOCPKT_DOSTOP;
> pt->pt_flags &= ~PF_NOSTOP;
766,768c766,768
< pti->pt_send &= ~TIOCPKT_DOSTOP;
< pti->pt_send |= TIOCPKT_NOSTOP;
< pti->pt_flags |= PF_NOSTOP;
---
> pt->pt_send &= ~TIOCPKT_DOSTOP;
> pt->pt_send |= TIOCPKT_NOSTOP;
> pt->pt_flags |= PF_NOSTOP;