get rid of passuc as it is equivalent to ureadc (shannon)

SCCS-vsn: sys/kern/subr_xxx.c 6.2
SCCS-vsn: sys/kern/tty.c 6.2

diff --git a/usr/src/sys/kern/subr_xxx.c b/usr/src/sys/kern/subr_xxx.c
index e43ea71..3a01cc3 100644 (file)
--- a/usr/src/sys/kern/subr_xxx.c
+++ b/usr/src/sys/kern/subr_xxx.c
@@ -1,4 +1,4 @@
-/*     subr_xxx.c      6.1     83/07/29        */
+/*     subr_xxx.c      6.2     83/09/09        */

 
 #include "../machine/pte.h"
 
 
 #include "../machine/pte.h"
 


@@ -132,41 +132,3 @@ strlen(s1)
        return (len);
 }
 #endif
        return (len);
 }
 #endif

-
-/*
- * Pass back c to the user.
- */
-passuc(c, uio)
-       register c;
-       struct uio *uio;
-{
-       register struct iovec *iov = uio->uio_iov;
-
-       switch (uio->uio_segflg) {
-
-       case 0:
-               if (subyte(iov->iov_base, c) < 0)
-                       goto fault;
-               break;
-
-       case 1:
-               *iov->iov_base = c;
-               break;
-
-       case 2:
-               if (suibyte(iov->iov_base, c) < 0)
-                       goto fault;
-               break;
-       }
-       iov->iov_base++;
-       iov->iov_len--;
-       uio->uio_resid--;
-       uio->uio_offset++;
-       if (iov->iov_len <= 0) {
-               uio->uio_iov++;
-               uio->uio_iovcnt--;
-       }
-       return (0);
-fault:
-       return (EFAULT);
-}

diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index 70514a8..458c46d 100644 (file)
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*     tty.c   6.1     83/07/29        */
+/*     tty.c   6.2     83/09/09        */

 
 #include "../machine/reg.h"
 
 
 #include "../machine/reg.h"
 


@@ -1050,8 +1050,8 @@ loop:
                        goto loop;
                }
                splx(s);
                        goto loop;
                }
                splx(s);

-               while (!error && tp->t_rawq.c_cc && uio->uio_iovcnt)
-                       error = passuc(getc(&tp->t_rawq), uio);
+               while (!error && tp->t_rawq.c_cc && uio->uio_resid)
+                       error = ureadc(getc(&tp->t_rawq), uio);

                goto checktandem;
        }
 
                goto checktandem;
        }
 


@@ -1120,10 +1120,10 @@ loop:
                /*
                 * Give user character.
                 */
                /*
                 * Give user character.
                 */

-               error = passuc(c & 0177, uio);
+               error = ureadc(c & 0177, uio);

                if (error)
                        break;
                if (error)
                        break;

-               if (uio->uio_iovcnt == 0)
+               if (uio->uio_resid == 0)

                        break;
                /*
                 * In cooked mode check for a "break character"
                        break;
                /*
                 * In cooked mode check for a "break character"