p_devtmp => p_dupfd; eliminate u.u_error from RETURN macro

[unix-history] / usr / src / sys / kern / sys_generic.c

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index d124408..9934b16 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,197 +1,350 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)sys_generic.c       6.11 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)sys_generic.c       7.20 (Berkeley) %G%

  */
 
 #include "param.h"
 #include "systm.h"
  */
 
 #include "param.h"
 #include "systm.h"

-#include "dir.h"
-#include "user.h"
+#include "syscontext.h"

 #include "ioctl.h"
 #include "file.h"
 #include "proc.h"
 #include "uio.h"
 #include "kernel.h"
 #include "stat.h"
 #include "ioctl.h"
 #include "file.h"
 #include "proc.h"
 #include "uio.h"
 #include "kernel.h"
 #include "stat.h"

+#include "malloc.h"
+#ifdef KTRACE
+#include "ktrace.h"
+#endif

 
 /*
  * Read system call.
  */
 
 /*
  * Read system call.
  */

-read()
-{
-       register struct a {
+read(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                char    *cbuf;
                unsigned count;
                int     fdes;
                char    *cbuf;
                unsigned count;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{
+       register struct file *fp;

        struct uio auio;
        struct iovec aiov;
        struct uio auio;
        struct iovec aiov;

+       long cnt, error = 0;
+#ifdef KTRACE
+       struct iovec ktriov;
+#endif

 
 

+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FREAD) == 0)
+               RETURN (EBADF);

        aiov.iov_base = (caddr_t)uap->cbuf;
        aiov.iov_len = uap->count;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;
        aiov.iov_base = (caddr_t)uap->cbuf;
        aiov.iov_len = uap->count;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;

-       rwuio(&auio, UIO_READ);
+       auio.uio_resid = uap->count;
+       auio.uio_rw = UIO_READ;
+       auio.uio_segflg = UIO_USERSPACE;
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(p, KTR_GENIO))
+               ktriov = aiov;
+#endif
+       cnt = uap->count;
+       if (error = (*fp->f_ops->fo_read)(fp, &auio, fp->f_cred))
+               if (auio.uio_resid != cnt && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (KTRPOINT(p, KTR_GENIO) && error == 0)
+               ktrgenio(p->p_tracep, uap->fdes, UIO_READ, &ktriov, cnt, error);
+#endif
+       *retval = cnt;
+       RETURN (error);

 }
 
 }
 

-readv()
-{
-       register struct a {
+/*
+ * Scatter read system call.
+ */
+readv(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                struct  iovec *iovp;
                int     fdes;
                struct  iovec *iovp;

-               int     iovcnt;
-       } *uap = (struct a *)u.u_ap;
+               unsigned iovcnt;
+       } *uap;
+       int *retval;
+{
+       register struct file *fp;

        struct uio auio;
        struct uio auio;

-       struct iovec aiov[16];          /* XXX */
+       register struct iovec *iov;
+       struct iovec aiov[UIO_SMALLIOV];
+       long i, cnt, error = 0;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif

 
 

-       if (uap->iovcnt <= 0 || uap->iovcnt > sizeof(aiov)/sizeof(aiov[0])) {
-               u.u_error = EINVAL;
-               return;
-       }
-       auio.uio_iov = aiov;
+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FREAD) == 0)
+               RETURN (EBADF);
+       if (uap->iovcnt > UIO_SMALLIOV) {
+               if (uap->iovcnt > UIO_MAXIOV)
+                       RETURN (EINVAL);
+               MALLOC(iov, struct iovec *, 
+                     sizeof(struct iovec) * uap->iovcnt, M_IOV, M_WAITOK);
+       } else
+               iov = aiov;
+       auio.uio_iov = iov;

        auio.uio_iovcnt = uap->iovcnt;
        auio.uio_iovcnt = uap->iovcnt;

-       u.u_error = copyin((caddr_t)uap->iovp, (caddr_t)aiov,
-           (unsigned)(uap->iovcnt * sizeof (struct iovec)));
-       if (u.u_error)
-               return;
-       rwuio(&auio, UIO_READ);
+       auio.uio_rw = UIO_READ;
+       auio.uio_segflg = UIO_USERSPACE;
+       if (error = copyin((caddr_t)uap->iovp, (caddr_t)iov,
+           uap->iovcnt * sizeof (struct iovec)))
+               goto done;
+       auio.uio_resid = 0;
+       for (i = 0; i < uap->iovcnt; i++) {
+               if (iov->iov_len < 0) {
+                       error = EINVAL;
+                       goto done;
+               }
+               auio.uio_resid += iov->iov_len;
+               if (auio.uio_resid < 0) {
+                       error = EINVAL;
+                       goto done;
+               }
+               iov++;
+       }
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(p, KTR_GENIO))  {
+               unsigned iovlen = auio.uio_iovcnt * sizeof (struct iovec);
+
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
+       }
+#endif
+       cnt = auio.uio_resid;
+       if (error = (*fp->f_ops->fo_read)(fp, &auio, fp->f_cred))
+               if (auio.uio_resid != cnt && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               if (error == 0)
+                       ktrgenio(p->p_tracep, uap->fdes, UIO_READ, ktriov,
+                           cnt, error);
+               FREE(ktriov, M_TEMP);
+       }
+#endif
+       *retval = cnt;
+done:
+       if (uap->iovcnt > UIO_SMALLIOV)
+               FREE(iov, M_IOV);
+       RETURN (error);

 }
 
 /*
  * Write system call
  */
 }
 
 /*
  * Write system call
  */

-write()
-{
-       register struct a {
+write(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                char    *cbuf;
                int     fdes;
                char    *cbuf;

-               int     count;
-       } *uap = (struct a *)u.u_ap;
+               unsigned count;
+       } *uap;
+       int *retval;
+{
+       register struct file *fp;

        struct uio auio;
        struct iovec aiov;
        struct uio auio;
        struct iovec aiov;

+       long cnt, error = 0;
+#ifdef KTRACE
+       struct iovec ktriov;
+#endif

 
 

+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FWRITE) == 0)
+               RETURN (EBADF);
+       aiov.iov_base = (caddr_t)uap->cbuf;
+       aiov.iov_len = uap->count;

        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;

-       aiov.iov_base = uap->cbuf;
-       aiov.iov_len = uap->count;
-       rwuio(&auio, UIO_WRITE);
+       auio.uio_resid = uap->count;
+       auio.uio_rw = UIO_WRITE;
+       auio.uio_segflg = UIO_USERSPACE;
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(p, KTR_GENIO))
+               ktriov = aiov;
+#endif
+       cnt = uap->count;
+       if (error = (*fp->f_ops->fo_write)(fp, &auio, fp->f_cred)) {
+               if (auio.uio_resid != cnt && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;
+               if (error == EPIPE)
+                       psignal(p, SIGPIPE);
+       }
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (KTRPOINT(p, KTR_GENIO) && error == 0)
+               ktrgenio(p->p_tracep, uap->fdes, UIO_WRITE,
+                   &ktriov, cnt, error);
+#endif
+       *retval = cnt;
+       RETURN (error);

 }
 
 }
 

-writev()
-{
-       register struct a {
+/*
+ * Gather write system call
+ */
+writev(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                struct  iovec *iovp;
                int     fdes;
                struct  iovec *iovp;

-               int     iovcnt;
-       } *uap = (struct a *)u.u_ap;
-       struct uio auio;
-       struct iovec aiov[16];          /* XXX */
-
-       if (uap->iovcnt <= 0 || uap->iovcnt > sizeof(aiov)/sizeof(aiov[0])) {
-               u.u_error = EINVAL;
-               return;
-       }
-       auio.uio_iov = aiov;
-       auio.uio_iovcnt = uap->iovcnt;
-       u.u_error = copyin((caddr_t)uap->iovp, (caddr_t)aiov,
-           (unsigned)(uap->iovcnt * sizeof (struct iovec)));
-       if (u.u_error)
-               return;
-       rwuio(&auio, UIO_WRITE);
-}
-
-rwuio(uio, rw)
-       register struct uio *uio;
-       enum uio_rw rw;
+               unsigned iovcnt;
+       } *uap;
+       int *retval;

 {
 {

-       struct a {
-               int     fdes;
-       };

        register struct file *fp;
        register struct file *fp;

+       struct uio auio;

        register struct iovec *iov;
        register struct iovec *iov;

-       int i, count;
+       struct iovec aiov[UIO_SMALLIOV];
+       long i, cnt, error = 0;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif

 
 

-       GETF(fp, ((struct a *)u.u_ap)->fdes);
-       if ((fp->f_flag&(rw==UIO_READ ? FREAD : FWRITE)) == 0) {
-               u.u_error = EBADF;
-               return;
-       }
-       uio->uio_resid = 0;
-       uio->uio_segflg = UIO_USERSPACE;
-       iov = uio->uio_iov;
-       for (i = 0; i < uio->uio_iovcnt; i++) {
+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FWRITE) == 0)
+               RETURN (EBADF);
+       if (uap->iovcnt > UIO_SMALLIOV) {
+               if (uap->iovcnt > UIO_MAXIOV)
+                       RETURN (EINVAL);
+               MALLOC(iov, struct iovec *, 
+                     sizeof(struct iovec) * uap->iovcnt, M_IOV, M_WAITOK);
+       } else
+               iov = aiov;
+       auio.uio_iov = iov;
+       auio.uio_iovcnt = uap->iovcnt;
+       auio.uio_rw = UIO_WRITE;
+       auio.uio_segflg = UIO_USERSPACE;
+       if (error = copyin((caddr_t)uap->iovp, (caddr_t)iov,
+           uap->iovcnt * sizeof (struct iovec)))
+               goto done;
+       auio.uio_resid = 0;
+       for (i = 0; i < uap->iovcnt; i++) {

                if (iov->iov_len < 0) {
                if (iov->iov_len < 0) {

-                       u.u_error = EINVAL;
-                       return;
+                       error = EINVAL;
+                       goto done;

                }
                }

-               uio->uio_resid += iov->iov_len;
-               if (uio->uio_resid < 0) {
-                       u.u_error = EINVAL;
-                       return;
+               auio.uio_resid += iov->iov_len;
+               if (auio.uio_resid < 0) {
+                       error = EINVAL;
+                       goto done;

                }
                iov++;
        }
                }
                iov++;
        }

-       count = uio->uio_resid;
-       uio->uio_offset = fp->f_offset;
-       if (setjmp(&u.u_qsave)) {
-               if (uio->uio_resid == count) {
-                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
-                               u.u_error = EINTR;
-                       else
-                               u.u_eosys = RESTARTSYS;
-               }
-       } else
-               u.u_error = (*fp->f_ops->fo_rw)(fp, rw, uio);
-       u.u_r.r_val1 = count - uio->uio_resid;
-       fp->f_offset += u.u_r.r_val1;
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(p, KTR_GENIO))  {
+               unsigned iovlen = auio.uio_iovcnt * sizeof (struct iovec);
+
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
+       }
+#endif
+       cnt = auio.uio_resid;
+       if (error = (*fp->f_ops->fo_write)(fp, &auio, fp->f_cred)) {
+               if (auio.uio_resid != cnt && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;
+               if (error == EPIPE)
+                       psignal(p, SIGPIPE);
+       }
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               if (error == 0)
+                       ktrgenio(p->p_tracep, uap->fdes, UIO_WRITE,
+                               ktriov, cnt, error);
+               FREE(ktriov, M_TEMP);
+       }
+#endif
+       *retval = cnt;
+done:
+       if (uap->iovcnt > UIO_SMALLIOV)
+               FREE(iov, M_IOV);
+       RETURN (error);

 }
 
 /*
  * Ioctl system call
  */
 }
 
 /*
  * Ioctl system call
  */

-ioctl()
-{
-       register struct file *fp;
-       struct a {
+/* ARGSUSED */
+ioctl(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                int     cmd;
                caddr_t cmarg;
        } *uap;
                int     fdes;
                int     cmd;
                caddr_t cmarg;
        } *uap;

-       register int com;
+       int *retval;
+{
+       register struct file *fp;
+       register int com, error;

        register u_int size;
        register u_int size;

-       char data[IOCPARM_MASK+1];
-
-       uap = (struct a *)u.u_ap;
-       GETF(fp, uap->fdes);
-       if ((fp->f_flag & (FREAD|FWRITE)) == 0) {
-               u.u_error = EBADF;
-               return;
-       }
+       caddr_t memp = 0;
+#define STK_PARAMS     128
+       char stkbuf[STK_PARAMS];
+       caddr_t data = stkbuf;
+
+       if ((unsigned)uap->fdes >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL)
+               RETURN (EBADF);
+       if ((fp->f_flag & (FREAD|FWRITE)) == 0)
+               RETURN (EBADF);

        com = uap->cmd;
 
        com = uap->cmd;
 

-#if defined(vax) && defined(COMPAT)
-       /*
-        * Map old style ioctl's into new for the
-        * sake of backwards compatibility (sigh).
-        */
-       if ((com&~0xffff) == 0) {
-               com = mapioctl(com);
-               if (com == 0) {
-                       u.u_error = EINVAL;
-                       return;
-               }
-       }
-#endif

        if (com == FIOCLEX) {
                u.u_pofile[uap->fdes] |= UF_EXCLOSE;
        if (com == FIOCLEX) {
                u.u_pofile[uap->fdes] |= UF_EXCLOSE;

-               return;
+               RETURN (0);

        }
        if (com == FIONCLEX) {
                u.u_pofile[uap->fdes] &= ~UF_EXCLOSE;
        }
        if (com == FIONCLEX) {
                u.u_pofile[uap->fdes] &= ~UF_EXCLOSE;

-               return;
+               RETURN (0);

        }
 
        /*
        }
 
        /*


@@ -199,94 +352,93 @@ ioctl()
         * amount of data to be copied to/from the
         * user's address space.
         */
         * amount of data to be copied to/from the
         * user's address space.
         */

-       size = (com &~ (IOC_INOUT|IOC_VOID)) >> 16;
-       if (size > sizeof (data)) {
-               u.u_error = EFAULT;
-               return;
+       size = IOCPARM_LEN(com);
+       if (size > IOCPARM_MAX)
+               RETURN (ENOTTY);
+       if (size > sizeof (stkbuf)) {
+               memp = (caddr_t)malloc((u_long)size, M_IOCTLOPS, M_WAITOK);
+               data = memp;

        }
        if (com&IOC_IN) {
                if (size) {
        }
        if (com&IOC_IN) {
                if (size) {

-                       u.u_error =
-                           copyin(uap->cmarg, (caddr_t)data, (u_int)size);
-                       if (u.u_error)
-                               return;
+                       error = copyin(uap->cmarg, data, (u_int)size);
+                       if (error) {
+                               if (memp)
+                                       free(memp, M_IOCTLOPS);
+                               RETURN (error);
+                       }

                } else
                        *(caddr_t *)data = uap->cmarg;
        } else if ((com&IOC_OUT) && size)
                /*
                } else
                        *(caddr_t *)data = uap->cmarg;
        } else if ((com&IOC_OUT) && size)
                /*

-                * Zero the buffer on the stack so the user
-                * always gets back something deterministic.
+                * Zero the buffer so the user always
+                * gets back something deterministic.

                 */
                 */

-               bzero((caddr_t)data, size);
+               bzero(data, size);

        else if (com&IOC_VOID)
                *(caddr_t *)data = uap->cmarg;
 
        switch (com) {
 
        case FIONBIO:
        else if (com&IOC_VOID)
                *(caddr_t *)data = uap->cmarg;
 
        switch (com) {
 
        case FIONBIO:

-               u.u_error = fset(fp, FNDELAY, *(int *)data);
-               return;
+               error = fset(fp, FNDELAY, *(int *)data);
+               break;

 
        case FIOASYNC:
 
        case FIOASYNC:

-               u.u_error = fset(fp, FASYNC, *(int *)data);
-               return;
+               error = fset(fp, FASYNC, *(int *)data);
+               break;

 
        case FIOSETOWN:
 
        case FIOSETOWN:

-               u.u_error = fsetown(fp, *(int *)data);
-               return;
+               error = fsetown(fp, *(int *)data);
+               break;

 
        case FIOGETOWN:
 
        case FIOGETOWN:

-               u.u_error = fgetown(fp, (int *)data);
-               return;
+               error = fgetown(fp, (int *)data);
+               break;
+       default:
+               error = (*fp->f_ops->fo_ioctl)(fp, com, data);
+               /*
+                * Copy any data to user, size was
+                * already set and checked above.
+                */
+               if (error == 0 && (com&IOC_OUT) && size)
+                       error = copyout(data, uap->cmarg, (u_int)size);
+               break;

        }
        }

-       u.u_error = (*fp->f_ops->fo_ioctl)(fp, com, data);
-       /*
-        * Copy any data to user, size was
-        * already set and checked above.
-        */
-       if (u.u_error == 0 && (com&IOC_OUT) && size)
-               u.u_error = copyout(data, uap->cmarg, (u_int)size);
+       if (memp)
+               free(memp, M_IOCTLOPS);
+       RETURN (error);

 }
 
 }
 

-int    unselect();

 int    nselcoll;
 
 int    nselcoll;
 

-/*
- * Select uses bit masks of file descriptors in ints.
- * These macros manipulate such bit fields (the filesystem macros use chars).
- */
-#define NBI            (sizeof(int) * NBBY)            /* bits per int */
-#define        NI              howmany(NOFILE, NBI)
-#define        tbit(p, n)      ((p)[(n)/NBI] & (1 << ((n) % NBI)))
-#define        sbit(p, n)      ((p)[(n)/NBI] |= (1 << ((n) % NBI)))
-#define        cbit(p, n)      ((p)[(n)/NBI] &= ~(1 << ((n) % NBI)))
-

 /*
  * Select system call.
  */
 /*
  * Select system call.
  */

-select()
-{
-       register struct uap  {
+select(p, uap, retval)
+       register struct proc *p;
+       register struct args {

                int     nd;
                int     nd;

-               int     *in, *ou, *ex;
+               fd_set  *in, *ou, *ex;

                struct  timeval *tv;
                struct  timeval *tv;

-       } *uap = (struct uap *)u.u_ap;
-       int ibits[3][NI], obits[3][NI];
+       } *uap;
+       int *retval;
+{
+       fd_set ibits[3], obits[3];

        struct timeval atv;
        struct timeval atv;

-       int s, ncoll, ni;
-       label_t lqsave;
+       int s, ncoll, ni, error = 0, timo;

 
 

-       bzero(ibits, sizeof(ibits));
-       bzero(obits, sizeof(obits));
+       bzero((caddr_t)ibits, sizeof(ibits));
+       bzero((caddr_t)obits, sizeof(obits));

        if (uap->nd > NOFILE)
                uap->nd = NOFILE;       /* forgiving, if slightly wrong */
        if (uap->nd > NOFILE)
                uap->nd = NOFILE;       /* forgiving, if slightly wrong */

-       ni = howmany(uap->nd, NBI);
+       ni = howmany(uap->nd, NFDBITS);

 
 #define        getbits(name, x) \
        if (uap->name) { \
 
 #define        getbits(name, x) \
        if (uap->name) { \

-               u.u_error = copyin((caddr_t)uap->name, (caddr_t)ibits[x], \
-                   ni * sizeof(int)); \
-               if (u.u_error) \
+               error = copyin((caddr_t)uap->name, (caddr_t)&ibits[x], \
+                   (unsigned)(ni * sizeof(fd_mask))); \
+               if (error) \

                        goto done; \
        }
        getbits(in, 0);
                        goto done; \
        }
        getbits(in, 0);


@@ -295,21 +447,23 @@ select()
 #undef getbits
 
        if (uap->tv) {
 #undef getbits
 
        if (uap->tv) {

-               u.u_error = copyin((caddr_t)uap->tv, (caddr_t)&atv,
+               error = copyin((caddr_t)uap->tv, (caddr_t)&atv,

                        sizeof (atv));
                        sizeof (atv));

-               if (u.u_error)
+               if (error)

                        goto done;
                if (itimerfix(&atv)) {
                        goto done;
                if (itimerfix(&atv)) {

-                       u.u_error = EINVAL;
+                       error = EINVAL;

                        goto done;
                }
                s = splhigh(); timevaladd(&atv, &time); splx(s);
                        goto done;
                }
                s = splhigh(); timevaladd(&atv, &time); splx(s);

-       }
+               timo = hzto(&atv);
+       } else
+               timo = 0;

 retry:
        ncoll = nselcoll;
 retry:
        ncoll = nselcoll;

-       u.u_procp->p_flag |= SSEL;
-       u.u_r.r_val1 = selscan(ibits, obits, uap->nd);
-       if (u.u_error || u.u_r.r_val1)
+       p->p_flag |= SSEL;
+       error = selscan(ibits, obits, uap->nd, retval);
+       if (error || *retval)

                goto done;
        s = splhigh();
        /* this should be timercmp(&time, &atv, >=) */
                goto done;
        s = splhigh();
        /* this should be timercmp(&time, &atv, >=) */


@@ -318,70 +472,47 @@ retry:
                splx(s);
                goto done;
        }
                splx(s);
                goto done;
        }

-       if ((u.u_procp->p_flag & SSEL) == 0 || nselcoll != ncoll) {
-               u.u_procp->p_flag &= ~SSEL;
+       if ((p->p_flag & SSEL) == 0 || nselcoll != ncoll) {

                splx(s);
                goto retry;
        }
                splx(s);
                goto retry;
        }

-       u.u_procp->p_flag &= ~SSEL;
-       if (uap->tv) {
-               lqsave = u.u_qsave;
-               if (setjmp(&u.u_qsave)) {
-                       untimeout(unselect, (caddr_t)u.u_procp);
-                       u.u_error = EINTR;
-                       splx(s);
-                       goto done;
-               }
-               timeout(unselect, (caddr_t)u.u_procp, hzto(&atv));
-       }
-       sleep((caddr_t)&selwait, PZERO+1);
-       if (uap->tv) {
-               u.u_qsave = lqsave;
-               untimeout(unselect, (caddr_t)u.u_procp);
-       }
+       p->p_flag &= ~SSEL;
+       error = tsleep((caddr_t)&selwait, PSOCK | PCATCH, "select", timo);

        splx(s);
        splx(s);

-       goto retry;
+       if (error == 0)
+               goto retry;

 done:
 done:

+       p->p_flag &= ~SSEL;
+       /* select is not restarted after signals... */
+       if (error == ERESTART)
+               error = EINTR;
+       if (error == EWOULDBLOCK)
+               error = 0;

 #define        putbits(name, x) \
        if (uap->name) { \
 #define        putbits(name, x) \
        if (uap->name) { \

-               int error = copyout((caddr_t)obits[x], (caddr_t)uap->name, \
-                   ni * sizeof(int)); \
-               if (error) \
-                       u.u_error = error; \
+               int error2 = copyout((caddr_t)&obits[x], (caddr_t)uap->name, \
+                   (unsigned)(ni * sizeof(fd_mask))); \
+               if (error2) \
+                       error = error2; \

        }
        }

-       if (u.u_error != EINTR) {
+       if (error == 0) {

                putbits(in, 0);
                putbits(ou, 1);
                putbits(ex, 2);
 #undef putbits
        }
                putbits(in, 0);
                putbits(ou, 1);
                putbits(ex, 2);
 #undef putbits
        }

+       RETURN (error);

 }
 
 }
 

-unselect(p)
-       register struct proc *p;
-{
-       register int s = splhigh();
-
-       switch (p->p_stat) {
-
-       case SSLEEP:
-               setrun(p);
-               break;
-
-       case SSTOP:
-               unsleep(p);
-               break;
-       }
-       splx(s);
-}
-
-selscan(ibits, obits, nfd)
-       int (*ibits)[NI], (*obits)[NI];
+selscan(ibits, obits, nfd, retval)
+       fd_set *ibits, *obits;
+       int nfd, *retval;

 {
 {

-       register int which, bits, i, j;
+       register int which, i, j;
+       register fd_mask bits;

        int flag;
        struct file *fp;
        int flag;
        struct file *fp;

-       int n = 0;
+       int error = 0, n = 0;

 
        for (which = 0; which < 3; which++) {
                switch (which) {
 
        for (which = 0; which < 3; which++) {
                switch (which) {


@@ -395,23 +526,24 @@ selscan(ibits, obits, nfd)
                case 2:
                        flag = 0; break;
                }
                case 2:
                        flag = 0; break;
                }

-               for (i = 0; i < nfd; i += NBI) {
-                       bits = ibits[which][i/NBI];
+               for (i = 0; i < nfd; i += NFDBITS) {
+                       bits = ibits[which].fds_bits[i/NFDBITS];

                        while ((j = ffs(bits)) && i + --j < nfd) {
                                bits &= ~(1 << j);
                                fp = u.u_ofile[i + j];
                                if (fp == NULL) {
                        while ((j = ffs(bits)) && i + --j < nfd) {
                                bits &= ~(1 << j);
                                fp = u.u_ofile[i + j];
                                if (fp == NULL) {

-                                       u.u_error = EBADF;
+                                       error = EBADF;

                                        break;
                                }
                                if ((*fp->f_ops->fo_select)(fp, flag)) {
                                        break;
                                }
                                if ((*fp->f_ops->fo_select)(fp, flag)) {

-                                       sbit(obits[which], i + j);
+                                       FD_SET(i + j, &obits[which]);

                                        n++;
                                }
                        }
                }
        }
                                        n++;
                                }
                        }
                }
        }

-       return (n);
+       *retval = n;
+       return (error);

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/