33c33
< __FBSDID("$FreeBSD: head/sys/kern/tty_pty.c 130892 2004-06-21 22:57:16Z phk $");
---
> __FBSDID("$FreeBSD: head/sys/kern/tty_pty.c 131114 2004-06-25 21:54:49Z phk $");
120d119
< #define PF_REMOTE 0x20 /* remote and flow controlled input */
226,268c225,226
< if (pt->pt_flags & PF_REMOTE) {
< while (isbackground(p, tp)) {
< sx_slock(&proctree_lock);
< PROC_LOCK(p);
< if (SIGISMEMBER(p->p_sigacts->ps_sigignore, SIGTTIN) ||
< SIGISMEMBER(td->td_sigmask, SIGTTIN) ||
< p->p_pgrp->pg_jobc == 0 || p->p_flag & P_PPWAIT) {
< PROC_UNLOCK(p);
< sx_sunlock(&proctree_lock);
< return (EIO);
< }
< pg = p->p_pgrp;
< PROC_UNLOCK(p);
< PGRP_LOCK(pg);
< sx_sunlock(&proctree_lock);
< pgsignal(pg, SIGTTIN, 1);
< PGRP_UNLOCK(pg);
< error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ptsbg",
< 0);
< if (error)
< return (error);
< }
< if (tp->t_canq.c_cc == 0) {
< if (flag & IO_NDELAY)
< return (EWOULDBLOCK);
< error = ttysleep(tp, TSA_PTS_READ(tp), TTIPRI | PCATCH,
< "ptsin", 0);
< if (error)
< return (error);
< goto again;
< }
< while (tp->t_canq.c_cc > 1 && uio->uio_resid > 0)
< if (ureadc(getc(&tp->t_canq), uio) < 0) {
< error = EFAULT;
< break;
< }
< if (tp->t_canq.c_cc == 1)
< (void) getc(&tp->t_canq);
< if (tp->t_canq.c_cc)
< return (error);
< } else
< if (tp->t_oproc)
< error = ttyld_read(tp, uio, flag);
---
> if (tp->t_oproc)
> error = ttyld_read(tp, uio, flag);
480,482c438
< ((pt->pt_flags & PF_REMOTE) ?
< (tp->t_canq.c_cc == 0) :
< ((tp->t_rawq.c_cc + tp->t_canq.c_cc < TTYHOG - 2) ||
---
> (((tp->t_rawq.c_cc + tp->t_canq.c_cc < TTYHOG - 2) ||
516,555d471
< if (pt->pt_flags & PF_REMOTE) {
< if (tp->t_canq.c_cc)
< goto block;
< while ((uio->uio_resid > 0 || cc > 0) &&
< tp->t_canq.c_cc < TTYHOG - 1) {
< if (cc == 0) {
< cc = min(uio->uio_resid, BUFSIZ);
< cc = min(cc, TTYHOG - 1 - tp->t_canq.c_cc);
< cp = locbuf;
< error = uiomove(cp, cc, uio);
< if (error)
< return (error);
< /* check again for safety */
< if ((tp->t_state & TS_ISOPEN) == 0) {
< /* adjust as usual */
< uio->uio_resid += cc;
< return (EIO);
< }
< }
< if (cc > 0) {
< cc = b_to_q((char *)cp, cc, &tp->t_canq);
< /*
< * XXX we don't guarantee that the canq size
< * is >= TTYHOG, so the above b_to_q() may
< * leave some bytes uncopied. However, space
< * is guaranteed for the null terminator if
< * we don't fail here since (TTYHOG - 1) is
< * not a multiple of CBSIZE.
< */
< if (cc > 0)
< break;
< }
< }
< /* adjust for data copied in but not written */
< uio->uio_resid += cc;
< (void) putc(0, &tp->t_canq);
< ttwakeup(tp);
< wakeup(TSA_PTS_READ(tp));
< return (0);
< }
646,653d561
<
< case TIOCREMOTE:
< if (*(int *)data)
< pt->pt_flags |= PF_REMOTE;
< else
< pt->pt_flags &= ~PF_REMOTE;
< ttyflush(tp, FREAD|FWRITE);
< return (0);