ttysleep to catch revoked terminals

SCCS-vsn: sys/tahoe/vba/mp.c 7.14
SCCS-vsn: sys/tahoe/vba/vx.c 7.10

diff --git a/usr/src/sys/tahoe/vba/mp.c b/usr/src/sys/tahoe/vba/mp.c
index 8bb5ba4..3dcc8db 100644 (file)
--- a/usr/src/sys/tahoe/vba/mp.c
+++ b/usr/src/sys/tahoe/vba/mp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)mp.c        7.13 (Berkeley) %G%
+ *     @(#)mp.c        7.14 (Berkeley) %G%

  */
 
 #include "mp.h"
  */
 
 #include "mp.h"


@@ -258,9 +258,8 @@ restart:
        }
        while ((mode&O_NONBLOCK) == 0 && (tp->t_cflag&CLOCAL) == 0 &&  
            (tp->t_state & TS_CARR_ON) == 0) {
        }
        while ((mode&O_NONBLOCK) == 0 && (tp->t_cflag&CLOCAL) == 0 &&  
            (tp->t_state & TS_CARR_ON) == 0) {

-               if ((error = tsleep((caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
-                                   ttopen, 0)) ||
-                   (error = ttclosed(tp)))
+               if (error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
+                   ttopen, 0))

                        goto bad;
                /*
                 * a mpclose() might have disabled port. if so restart
                        goto bad;
                /*
                 * a mpclose() might have disabled port. if so restart

diff --git a/usr/src/sys/tahoe/vba/vx.c b/usr/src/sys/tahoe/vba/vx.c
index 3740dd6..3df18d7 100644 (file)
--- a/usr/src/sys/tahoe/vba/vx.c
+++ b/usr/src/sys/tahoe/vba/vx.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)vx.c        7.9 (Berkeley) %G%
+ *     @(#)vx.c        7.10 (Berkeley) %G%

  */
 
 #include "vx.h"
  */
 
 #include "vx.h"


@@ -243,9 +243,8 @@ vxopen(dev, flag)
        while (!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) && 
              (tp->t_state&TS_CARR_ON) == 0) {
                tp->t_state |= TS_WOPEN;
        while (!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) && 
              (tp->t_state&TS_CARR_ON) == 0) {
                tp->t_state |= TS_WOPEN;

-               if ((error = tsleep((caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
-                                   ttopen, 0)) ||
-                   (error = ttclosed(tp)))
+               if (error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
+                   ttopen, 0))

                        break;
        }
        if (error == 0)
                        break;
        }
        if (error == 0)