BSD 4_4_Lite2 release

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

diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index 541467f..3f2e424 100644 (file)
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -1,43 +1,81 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1989, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)kern_descrip.c      7.22 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)kern_descrip.c      8.8 (Berkeley) 2/14/95

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "filedesc.h"
-#include "kernel.h"
-#include "vnode.h"
-#include "proc.h"
-#include "file.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "stat.h"
-#include "ioctl.h"
-#include "fcntl.h"
-#include "malloc.h"
-#include "syslog.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/filedesc.h>
+#include <sys/kernel.h>
+#include <sys/vnode.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/syslog.h>
+#include <sys/unistd.h>
+#include <sys/resourcevar.h>
+
+#include <sys/mount.h>
+#include <sys/syscallargs.h>

 
 /*
  * Descriptor management.
  */
 
 /*
  * Descriptor management.
  */

+struct filelist filehead;      /* head of list of open files */
+int nfiles;                    /* actual number of open files */

 
 /*
  * System calls on descriptors.
  */
 /* ARGSUSED */
 
 /*
  * System calls on descriptors.
  */
 /* ARGSUSED */

+int

 getdtablesize(p, uap, retval)
        struct proc *p;
 getdtablesize(p, uap, retval)
        struct proc *p;

-       struct args *uap;
-       int *retval;
+       void *uap;
+       register_t *retval;

 {
 
 {
 

-       *retval = p->p_rlimit[RLIMIT_OFILE].rlim_cur;
+       *retval = min((int)p->p_rlimit[RLIMIT_NOFILE].rlim_cur, maxfiles);

        return (0);
 }
 
        return (0);
 }
 


@@ -45,60 +83,61 @@ getdtablesize(p, uap, retval)
  * Duplicate a file descriptor.
  */
 /* ARGSUSED */
  * Duplicate a file descriptor.
  */
 /* ARGSUSED */

+int

 dup(p, uap, retval)
        struct proc *p;
 dup(p, uap, retval)
        struct proc *p;

-       struct args {
-               int     i;
-       } *uap;
-       int *retval;
+       struct dup_args /* {
+               syscallarg(u_int) fd;
+       } */ *uap;
+       register_t *retval;

 {
 {

-       register struct filedesc *fdp = p->p_fd;
-       struct file *fp;
-       int fd, error;
+       register struct filedesc *fdp;
+       u_int old;
+       int new, error;

 
 

+       old = SCARG(uap, fd);

        /*
         * XXX Compatibility
         */
        /*
         * XXX Compatibility
         */

-       if (uap->i &~ 077) { uap->i &= 077; return (dup2(p, uap, retval)); }
+       if (old &~ 077) {
+               SCARG(uap, fd) &= 077;
+               return (dup2(p, uap, retval));
+       }

 
 

-       if ((unsigned)uap->i >= fdp->fd_nfiles ||
-           (fp = fdp->fd_ofiles[uap->i]) == NULL)
+       fdp = p->p_fd;
+       if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL)

                return (EBADF);
                return (EBADF);

-       if (error = fdalloc(p, 0, &fd))
+       if (error = fdalloc(p, 0, &new))

                return (error);
                return (error);

-       fdp->fd_ofiles[fd] = fp;
-       fdp->fd_ofileflags[fd] = fdp->fd_ofileflags[uap->i] &~ UF_EXCLOSE;
-       fp->f_count++;
-       if (fd > fdp->fd_lastfile)
-               fdp->fd_lastfile = fd;
-       *retval = fd;
-       return (0);
+       return (finishdup(fdp, (int)old, new, retval));

 }
 
 /*
  * Duplicate a file descriptor to a particular value.
  */
 /* ARGSUSED */
 }
 
 /*
  * Duplicate a file descriptor to a particular value.
  */
 /* ARGSUSED */

+int

 dup2(p, uap, retval)
        struct proc *p;
 dup2(p, uap, retval)
        struct proc *p;

-       struct args {
-               u_int   from;
-               u_int   to;
-       } *uap;
-       int *retval;
+       struct dup2_args /* {
+               syscallarg(u_int) from;
+               syscallarg(u_int) to;
+       } */ *uap;
+       register_t *retval;

 {
        register struct filedesc *fdp = p->p_fd;
 {
        register struct filedesc *fdp = p->p_fd;

-       register struct file *fp;
-       register u_int old = uap->from, new = uap->to;
+       register int old = SCARG(uap, from), new = SCARG(uap, to);

        int i, error;
 
        if (old >= fdp->fd_nfiles ||
        int i, error;
 
        if (old >= fdp->fd_nfiles ||

-           (fp = fdp->fd_ofiles[old]) == NULL ||
-           new >= p->p_rlimit[RLIMIT_OFILE].rlim_cur)
+           fdp->fd_ofiles[old] == NULL ||
+           new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur ||
+           new >= maxfiles)

                return (EBADF);
                return (EBADF);

-       *retval = new;
-       if (old == new)
+       if (old == new) {
+               *retval = new;

                return (0);
                return (0);

+       }

        if (new >= fdp->fd_nfiles) {
                if (error = fdalloc(p, new, &i))
                        return (error);
        if (new >= fdp->fd_nfiles) {
                if (error = fdalloc(p, new, &i))
                        return (error);


@@ -112,58 +151,53 @@ dup2(p, uap, retval)
                 */
                (void) closef(fdp->fd_ofiles[new], p);
        }
                 */
                (void) closef(fdp->fd_ofiles[new], p);
        }

-       fdp->fd_ofiles[new] = fp;
-       fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE;
-       fp->f_count++;
-       if (new > fdp->fd_lastfile)
-               fdp->fd_lastfile = new;
-       return (0);
+       return (finishdup(fdp, (int)old, (int)new, retval));

 }
 
 /*
  * The file control system call.
  */
 /* ARGSUSED */
 }
 
 /*
  * The file control system call.
  */
 /* ARGSUSED */

+int

 fcntl(p, uap, retval)
        struct proc *p;
 fcntl(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               int     cmd;
-               int     arg;
-       } *uap;
-       int *retval;
+       register struct fcntl_args /* {
+               syscallarg(int) fd;
+               syscallarg(int) cmd;
+               syscallarg(void *) arg;
+       } */ *uap;
+       register_t *retval;

 {
 {

+       int fd = SCARG(uap, fd);

        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        register char *pop;
        struct vnode *vp;
        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        register char *pop;
        struct vnode *vp;

-       int i, error, flags = F_POSIX;
+       int i, tmp, error, flg = F_POSIX;

        struct flock fl;
        struct flock fl;

+       u_int newmin;

 
 

-       if ((unsigned)uap->fd >= fdp->fd_nfiles ||
-           (fp = fdp->fd_ofiles[uap->fd]) == NULL)
+       if ((u_int)fd >= fdp->fd_nfiles ||
+           (fp = fdp->fd_ofiles[fd]) == NULL)

                return (EBADF);
                return (EBADF);

-       pop = &fdp->fd_ofileflags[uap->fd];
-       switch(uap->cmd) {
+       pop = &fdp->fd_ofileflags[fd];
+       switch (SCARG(uap, cmd)) {
+

        case F_DUPFD:
        case F_DUPFD:

-               if ((unsigned)uap->arg >= p->p_rlimit[RLIMIT_OFILE].rlim_cur)
+               newmin = (long)SCARG(uap, arg);
+               if (newmin >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur ||
+                   newmin >= maxfiles)

                        return (EINVAL);
                        return (EINVAL);

-               if (error = fdalloc(p, uap->arg, &i))
+               if (error = fdalloc(p, newmin, &i))

                        return (error);
                        return (error);

-               fdp->fd_ofiles[i] = fp;
-               fdp->fd_ofileflags[i] = *pop &~ UF_EXCLOSE;
-               fp->f_count++;
-               if (i > fdp->fd_lastfile)
-                       fdp->fd_lastfile = i;
-               *retval = i;
-               return (0);
+               return (finishdup(fdp, fd, i, retval));

 
        case F_GETFD:
                *retval = *pop & 1;
                return (0);
 
        case F_SETFD:
 
        case F_GETFD:
                *retval = *pop & 1;
                return (0);
 
        case F_SETFD:

-               *pop = (*pop &~ 1) | (uap->arg & 1);
+               *pop = (*pop &~ 1) | ((long)SCARG(uap, arg) & 1);

                return (0);
 
        case F_GETFL:
                return (0);
 
        case F_GETFL:


@@ -172,21 +206,49 @@ fcntl(p, uap, retval)
 
        case F_SETFL:
                fp->f_flag &= ~FCNTLFLAGS;
 
        case F_SETFL:
                fp->f_flag &= ~FCNTLFLAGS;

-               fp->f_flag |= FFLAGS(uap->arg) & FCNTLFLAGS;
-               if (error = fset(fp, FNDELAY, fp->f_flag & FNDELAY))
+               fp->f_flag |= FFLAGS((long)SCARG(uap, arg)) & FCNTLFLAGS;
+               tmp = fp->f_flag & FNONBLOCK;
+               error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, (caddr_t)&tmp, p);
+               if (error)

                        return (error);
                        return (error);

-               if (error = fset(fp, FASYNC, fp->f_flag & FASYNC))
-                       (void) fset(fp, FNDELAY, 0);
+               tmp = fp->f_flag & FASYNC;
+               error = (*fp->f_ops->fo_ioctl)(fp, FIOASYNC, (caddr_t)&tmp, p);
+               if (!error)
+                       return (0);
+               fp->f_flag &= ~FNONBLOCK;
+               tmp = 0;
+               (void) (*fp->f_ops->fo_ioctl)(fp, FIONBIO, (caddr_t)&tmp, p);

                return (error);
 
        case F_GETOWN:
                return (error);
 
        case F_GETOWN:

-               return (fgetown(fp, retval));
+               if (fp->f_type == DTYPE_SOCKET) {
+                       *retval = ((struct socket *)fp->f_data)->so_pgid;
+                       return (0);
+               }
+               error = (*fp->f_ops->fo_ioctl)
+                       (fp, TIOCGPGRP, (caddr_t)retval, p);
+               *retval = -*retval;
+               return (error);

 
        case F_SETOWN:
 
        case F_SETOWN:

-               return (fsetown(fp, uap->arg));
+               if (fp->f_type == DTYPE_SOCKET) {
+                       ((struct socket *)fp->f_data)->so_pgid =
+                           (long)SCARG(uap, arg);
+                       return (0);
+               }
+               if ((long)SCARG(uap, arg) <= 0) {
+                       SCARG(uap, arg) = (void *)(-(long)SCARG(uap, arg));
+               } else {
+                       struct proc *p1 = pfind((long)SCARG(uap, arg));
+                       if (p1 == 0)
+                               return (ESRCH);
+                       SCARG(uap, arg) = (void *)(long)p1->p_pgrp->pg_id;
+               }
+               return ((*fp->f_ops->fo_ioctl)
+                       (fp, TIOCSPGRP, (caddr_t)&SCARG(uap, arg), p));

 
        case F_SETLKW:
 
        case F_SETLKW:

-               flags |= F_WAIT;
+               flg |= F_WAIT;

                /* Fall into F_SETLK */
 
        case F_SETLK:
                /* Fall into F_SETLK */
 
        case F_SETLK:


@@ -194,7 +256,8 @@ fcntl(p, uap, retval)
                        return (EBADF);
                vp = (struct vnode *)fp->f_data;
                /* Copy in the lock structure */
                        return (EBADF);
                vp = (struct vnode *)fp->f_data;
                /* Copy in the lock structure */

-               error = copyin((caddr_t)uap->arg, (caddr_t)&fl, sizeof (fl));
+               error = copyin((caddr_t)SCARG(uap, arg), (caddr_t)&fl,
+                   sizeof (fl));

                if (error)
                        return (error);
                if (fl.l_whence == SEEK_CUR)
                if (error)
                        return (error);
                if (fl.l_whence == SEEK_CUR)


@@ -204,15 +267,18 @@ fcntl(p, uap, retval)
                case F_RDLCK:
                        if ((fp->f_flag & FREAD) == 0)
                                return (EBADF);
                case F_RDLCK:
                        if ((fp->f_flag & FREAD) == 0)
                                return (EBADF);

-                       return (VOP_ADVLOCK(vp, p, F_SETLK, &fl, flags));
+                       p->p_flag |= P_ADVLOCK;
+                       return (VOP_ADVLOCK(vp, (caddr_t)p, F_SETLK, &fl, flg));

 
                case F_WRLCK:
                        if ((fp->f_flag & FWRITE) == 0)
                                return (EBADF);
 
                case F_WRLCK:
                        if ((fp->f_flag & FWRITE) == 0)
                                return (EBADF);

-                       return (VOP_ADVLOCK(vp, p, F_SETLK, &fl, flags));
+                       p->p_flag |= P_ADVLOCK;
+                       return (VOP_ADVLOCK(vp, (caddr_t)p, F_SETLK, &fl, flg));

 
                case F_UNLCK:
 
                case F_UNLCK:

-                       return (VOP_ADVLOCK(vp, p, F_UNLCK, &fl, F_POSIX));
+                       return (VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &fl,
+                               F_POSIX));

 
                default:
                        return (EINVAL);
 
                default:
                        return (EINVAL);


@@ -223,14 +289,16 @@ fcntl(p, uap, retval)
                        return (EBADF);
                vp = (struct vnode *)fp->f_data;
                /* Copy in the lock structure */
                        return (EBADF);
                vp = (struct vnode *)fp->f_data;
                /* Copy in the lock structure */

-               error = copyin((caddr_t)uap->arg, (caddr_t)&fl, sizeof (fl));
+               error = copyin((caddr_t)SCARG(uap, arg), (caddr_t)&fl,
+                   sizeof (fl));

                if (error)
                        return (error);
                if (fl.l_whence == SEEK_CUR)
                        fl.l_start += fp->f_offset;
                if (error)
                        return (error);
                if (fl.l_whence == SEEK_CUR)
                        fl.l_start += fp->f_offset;

-               if (error = VOP_ADVLOCK(vp, p, F_GETLK, &fl, F_POSIX))
+               if (error = VOP_ADVLOCK(vp, (caddr_t)p, F_GETLK, &fl, F_POSIX))

                        return (error);
                        return (error);

-               return (copyout((caddr_t)&fl, (caddr_t)uap->arg, sizeof (fl)));
+               return (copyout((caddr_t)&fl, (caddr_t)SCARG(uap, arg),
+                   sizeof (fl)));

 
        default:
                return (EINVAL);
 
        default:
                return (EINVAL);


@@ -238,83 +306,45 @@ fcntl(p, uap, retval)
        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 

-fset(fp, bit, value)
-       struct file *fp;
-       int bit, value;
-{
-
-       if (value)
-               fp->f_flag |= bit;
-       else
-               fp->f_flag &= ~bit;
-       return (fioctl(fp, (int)(bit == FNDELAY ? FIONBIO : FIOASYNC),
-           (caddr_t)&value));
-}
-
-fgetown(fp, valuep)
-       struct file *fp;
-       int *valuep;
-{
-       int error;
-
-       switch (fp->f_type) {
-
-       case DTYPE_SOCKET:
-               *valuep = ((struct socket *)fp->f_data)->so_pgid;
-               return (0);
-
-       default:
-               error = fioctl(fp, (int)TIOCGPGRP, (caddr_t)valuep);
-               *valuep = -*valuep;
-               return (error);
-       }
-}
-
-fsetown(fp, value)
-       struct file *fp;
-       int value;
-{
-
-       if (fp->f_type == DTYPE_SOCKET) {
-               ((struct socket *)fp->f_data)->so_pgid = value;
-               return (0);
-       }
-       if (value > 0) {
-               struct proc *p = pfind(value);
-               if (p == 0)
-                       return (ESRCH);
-               value = p->p_pgrp->pg_id;
-       } else
-               value = -value;
-       return (fioctl(fp, (int)TIOCSPGRP, (caddr_t)&value));
-}
-
-fioctl(fp, cmd, value)
-       struct file *fp;
-       int cmd;
-       caddr_t value;
+/*
+ * Common code for dup, dup2, and fcntl(F_DUPFD).
+ */
+int
+finishdup(fdp, old, new, retval)
+       register struct filedesc *fdp;
+       register int old, new;
+       register_t *retval;

 {
 {

+       register struct file *fp;

 
 

-       return ((*fp->f_ops->fo_ioctl)(fp, cmd, value));
+       fp = fdp->fd_ofiles[old];
+       fdp->fd_ofiles[new] = fp;
+       fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE;
+       fp->f_count++;
+       if (new > fdp->fd_lastfile)
+               fdp->fd_lastfile = new;
+       *retval = new;
+       return (0);

 }
 
 /*
  * Close a file descriptor.
  */
 /* ARGSUSED */
 }
 
 /*
  * Close a file descriptor.
  */
 /* ARGSUSED */

+int

 close(p, uap, retval)
        struct proc *p;
 close(p, uap, retval)
        struct proc *p;

-       struct args {
-               int     fd;
-       } *uap;
-       int *retval;
+       struct close_args /* {
+               syscallarg(int) fd;
+       } */ *uap;
+       register_t *retval;

 {
 {

+       int fd = SCARG(uap, fd);

        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;

-       register int fd = uap->fd;

        register u_char *pf;
 
        register u_char *pf;
 

-       if ((unsigned)fd >= fdp->fd_nfiles ||
+       if ((u_int)fd >= fdp->fd_nfiles ||

            (fp = fdp->fd_ofiles[fd]) == NULL)
                return (EBADF);
        pf = (u_char *)&fdp->fd_ofileflags[fd];
            (fp = fdp->fd_ofiles[fd]) == NULL)
                return (EBADF);
        pf = (u_char *)&fdp->fd_ofileflags[fd];


@@ -329,30 +359,78 @@ close(p, uap, retval)
        return (closef(fp, p));
 }
 
        return (closef(fp, p));
 }
 

+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+/*
+ * Return status information about a file descriptor.
+ */
+/* ARGSUSED */
+int
+compat_43_fstat(p, uap, retval)
+       struct proc *p;
+       register struct compat_43_fstat_args /* {
+               syscallarg(int) fd;
+               syscallarg(struct ostat *) sb;
+       } */ *uap;
+       register_t *retval;
+{
+       int fd = SCARG(uap, fd);
+       register struct filedesc *fdp = p->p_fd;
+       register struct file *fp;
+       struct stat ub;
+       struct ostat oub;
+       int error;
+
+       if ((u_int)fd >= fdp->fd_nfiles ||
+           (fp = fdp->fd_ofiles[fd]) == NULL)
+               return (EBADF);
+       switch (fp->f_type) {
+
+       case DTYPE_VNODE:
+               error = vn_stat((struct vnode *)fp->f_data, &ub, p);
+               break;
+
+       case DTYPE_SOCKET:
+               error = soo_stat((struct socket *)fp->f_data, &ub);
+               break;
+
+       default:
+               panic("ofstat");
+               /*NOTREACHED*/
+       }
+       cvtstat(&ub, &oub);
+       if (error == 0)
+               error = copyout((caddr_t)&oub, (caddr_t)SCARG(uap, sb),
+                   sizeof (oub));
+       return (error);
+}
+#endif /* COMPAT_43 || COMPAT_SUNOS */
+

 /*
  * Return status information about a file descriptor.
  */
 /* ARGSUSED */
 /*
  * Return status information about a file descriptor.
  */
 /* ARGSUSED */

+int

 fstat(p, uap, retval)
        struct proc *p;
 fstat(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               struct  stat *sb;
-       } *uap;
-       int *retval;
+       register struct fstat_args /* {
+               syscallarg(int) fd;
+               syscallarg(struct stat *) sb;
+       } */ *uap;
+       register_t *retval;

 {
 {

+       int fd = SCARG(uap, fd);

        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        struct stat ub;
        int error;
 
        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        struct stat ub;
        int error;
 

-       if ((unsigned)uap->fd >= fdp->fd_nfiles ||
-           (fp = fdp->fd_ofiles[uap->fd]) == NULL)
+       if ((u_int)fd >= fdp->fd_nfiles ||
+           (fp = fdp->fd_ofiles[fd]) == NULL)

                return (EBADF);
        switch (fp->f_type) {
 
        case DTYPE_VNODE:
                return (EBADF);
        switch (fp->f_type) {
 
        case DTYPE_VNODE:

-               error = vn_stat((struct vnode *)fp->f_data, &ub);
+               error = vn_stat((struct vnode *)fp->f_data, &ub, p);

                break;
 
        case DTYPE_SOCKET:
                break;
 
        case DTYPE_SOCKET:


@@ -364,15 +442,56 @@ fstat(p, uap, retval)
                /*NOTREACHED*/
        }
        if (error == 0)
                /*NOTREACHED*/
        }
        if (error == 0)

-               error = copyout((caddr_t)&ub, (caddr_t)uap->sb, sizeof (ub));
+               error = copyout((caddr_t)&ub, (caddr_t)SCARG(uap, sb),
+                   sizeof (ub));

        return (error);
 }
 
        return (error);
 }
 

+/*
+ * Return pathconf information about a file descriptor.
+ */
+/* ARGSUSED */
+int
+fpathconf(p, uap, retval)
+       struct proc *p;
+       register struct fpathconf_args /* {
+               syscallarg(int) fd;
+               syscallarg(int) name;
+       } */ *uap;
+       register_t *retval;
+{
+       int fd = SCARG(uap, fd);
+       struct filedesc *fdp = p->p_fd;
+       struct file *fp;
+       struct vnode *vp;
+
+       if ((u_int)fd >= fdp->fd_nfiles ||
+           (fp = fdp->fd_ofiles[fd]) == NULL)
+               return (EBADF);
+       switch (fp->f_type) {
+
+       case DTYPE_SOCKET:
+               if (SCARG(uap, name) != _PC_PIPE_BUF)
+                       return (EINVAL);
+               *retval = PIPE_BUF;
+               return (0);
+
+       case DTYPE_VNODE:
+               vp = (struct vnode *)fp->f_data;
+               return (VOP_PATHCONF(vp, SCARG(uap, name), retval));
+
+       default:
+               panic("fpathconf");
+       }
+       /*NOTREACHED*/
+}
+

 /*
  * Allocate a file descriptor for the process.
  */
 int fdexpand;
 
 /*
  * Allocate a file descriptor for the process.
  */
 int fdexpand;
 

+int

 fdalloc(p, want, result)
        struct proc *p;
        int want;
 fdalloc(p, want, result)
        struct proc *p;
        int want;


@@ -389,7 +508,7 @@ fdalloc(p, want, result)
         * of want or fd_freefile.  If that fails, consider
         * expanding the ofile array.
         */
         * of want or fd_freefile.  If that fails, consider
         * expanding the ofile array.
         */

-       lim = p->p_rlimit[RLIMIT_OFILE].rlim_cur;
+       lim = min((int)p->p_rlimit[RLIMIT_NOFILE].rlim_cur, maxfiles);

        for (;;) {
                last = min(fdp->fd_nfiles, lim);
                if ((i = want) < fdp->fd_freefile)
        for (;;) {
                last = min(fdp->fd_nfiles, lim);
                if ((i = want) < fdp->fd_freefile)


@@ -441,16 +560,17 @@ fdalloc(p, want, result)
  * Check to see whether n user file descriptors
  * are available to the process p.
  */
  * Check to see whether n user file descriptors
  * are available to the process p.
  */

+int

 fdavail(p, n)
        struct proc *p;
        register int n;
 {
        register struct filedesc *fdp = p->p_fd;
        register struct file **fpp;
 fdavail(p, n)
        struct proc *p;
        register int n;
 {
        register struct filedesc *fdp = p->p_fd;
        register struct file **fpp;

-       register int i;
+       register int i, lim;

 
 

-       if ((i = p->p_rlimit[RLIMIT_OFILE].rlim_cur - fdp->fd_nfiles) > 0 &&
-           (n -= i) <= 0)
+       lim = min((int)p->p_rlimit[RLIMIT_NOFILE].rlim_cur, maxfiles);
+       if ((i = lim - fdp->fd_nfiles) > 0 && (n -= i) <= 0)

                return (1);
        fpp = &fdp->fd_ofiles[fdp->fd_freefile];
        for (i = fdp->fd_nfiles - fdp->fd_freefile; --i >= 0; fpp++)
                return (1);
        fpp = &fdp->fd_ofiles[fdp->fd_freefile];
        for (i = fdp->fd_nfiles - fdp->fd_freefile; --i >= 0; fpp++)


@@ -459,39 +579,43 @@ fdavail(p, n)
        return (0);
 }
 
        return (0);
 }
 

-struct file *lastf;

 /*
  * Create a new open file structure and allocate
  * a file decriptor for the process that refers to it.
  */
 /*
  * Create a new open file structure and allocate
  * a file decriptor for the process that refers to it.
  */

+int

 falloc(p, resultfp, resultfd)
        register struct proc *p;
        struct file **resultfp;
        int *resultfd;
 {
 falloc(p, resultfp, resultfd)
        register struct proc *p;
        struct file **resultfp;
        int *resultfd;
 {

-       register struct file *fp;
+       register struct file *fp, *fq;

        int error, i;
 
        if (error = fdalloc(p, 0, &i))
                return (error);
        int error, i;
 
        if (error = fdalloc(p, 0, &i))
                return (error);

-       if (lastf == 0)
-               lastf = file;
-       for (fp = lastf; fp < fileNFILE; fp++)
-               if (fp->f_count == 0)
-                       goto slot;
-       for (fp = file; fp < lastf; fp++)
-               if (fp->f_count == 0)
-                       goto slot;
-       tablefull("file");
-       return (ENFILE);
-slot:
+       if (nfiles >= maxfiles) {
+               tablefull("file");
+               return (ENFILE);
+       }
+       /*
+        * Allocate a new file descriptor.
+        * If the process has file descriptor zero open, add to the list
+        * of open files at that point, otherwise put it at the front of
+        * the list of open files.
+        */
+       nfiles++;
+       MALLOC(fp, struct file *, sizeof(struct file), M_FILE, M_WAITOK);
+       bzero(fp, sizeof(struct file));
+       if (fq = p->p_fd->fd_ofiles[0]) {
+               LIST_INSERT_AFTER(fq, fp, f_list);
+       } else {
+               LIST_INSERT_HEAD(&filehead, fp, f_list);
+       }

        p->p_fd->fd_ofiles[i] = fp;
        fp->f_count = 1;
        p->p_fd->fd_ofiles[i] = fp;
        fp->f_count = 1;

-       fp->f_data = 0;
-       fp->f_offset = 0;

        fp->f_cred = p->p_ucred;
        crhold(fp->f_cred);
        fp->f_cred = p->p_ucred;
        crhold(fp->f_cred);

-       lastf = fp + 1;

        if (resultfp)
                *resultfp = fp;
        if (resultfd)
        if (resultfp)
                *resultfp = fp;
        if (resultfd)


@@ -499,6 +623,24 @@ slot:
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Free a file descriptor.
+ */
+void
+ffree(fp)
+       register struct file *fp;
+{
+       register struct file *fq;
+
+       LIST_REMOVE(fp, f_list);
+       crfree(fp->f_cred);
+#ifdef DIAGNOSTIC
+       fp->f_count = 0;
+#endif
+       nfiles--;
+       FREE(fp, M_FILE);
+}
+

 /*
  * Copy a filedesc structure.
  */
 /*
  * Copy a filedesc structure.
  */


@@ -536,7 +678,7 @@ fdcopy(p)
                 * allowing the table to shrink.
                 */
                i = newfdp->fd_nfiles;
                 * allowing the table to shrink.
                 */
                i = newfdp->fd_nfiles;

-               while (i > 2 * NDEXTENT && i >= newfdp->fd_lastfile * 2)
+               while (i > 2 * NDEXTENT && i > newfdp->fd_lastfile * 2)

                        i /= 2;
                MALLOC(newfdp->fd_ofiles, struct file **, i * OFILESIZE,
                    M_FILEDESC, M_WAITOK);
                        i /= 2;
                MALLOC(newfdp->fd_ofiles, struct file **, i * OFILESIZE,
                    M_FILEDESC, M_WAITOK);


@@ -580,10 +722,13 @@ fdfree(p)
 /*
  * Internal form of close.
  * Decrement reference count on file structure.
 /*
  * Internal form of close.
  * Decrement reference count on file structure.

+ * Note: p may be NULL when closing a file
+ * that was being passed in a message.

  */
  */

+int

 closef(fp, p)
        register struct file *fp;
 closef(fp, p)
        register struct file *fp;

-       struct proc *p;
+       register struct proc *p;

 {
        struct vnode *vp;
        struct flock lf;
 {
        struct vnode *vp;
        struct flock lf;


@@ -596,24 +741,34 @@ closef(fp, p)
         * locks owned by this process.  This is handled by setting
         * a flag in the unlock to free ONLY locks obeying POSIX
         * semantics, and not to free BSD-style file locks.
         * locks owned by this process.  This is handled by setting
         * a flag in the unlock to free ONLY locks obeying POSIX
         * semantics, and not to free BSD-style file locks.

+        * If the descriptor was in a message, POSIX-style locks
+        * aren't passed with the descriptor.

         */
         */

-       if (fp->f_type == DTYPE_VNODE) {
+       if (p && (p->p_flag & P_ADVLOCK) && fp->f_type == DTYPE_VNODE) {

                lf.l_whence = SEEK_SET;
                lf.l_start = 0;
                lf.l_len = 0;
                lf.l_type = F_UNLCK;
                vp = (struct vnode *)fp->f_data;
                lf.l_whence = SEEK_SET;
                lf.l_start = 0;
                lf.l_len = 0;
                lf.l_type = F_UNLCK;
                vp = (struct vnode *)fp->f_data;

-               (void) VOP_ADVLOCK(vp, p, F_UNLCK, &lf, F_POSIX);
+               (void) VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_POSIX);

        }
        if (--fp->f_count > 0)
                return (0);
        if (fp->f_count < 0)
                panic("closef: count < 0");
        }
        if (--fp->f_count > 0)
                return (0);
        if (fp->f_count < 0)
                panic("closef: count < 0");

-       if (fp->f_type == DTYPE_VNODE)
-               (void) VOP_ADVLOCK(vp, fp, F_UNLCK, &lf, F_FLOCK);
-       error = (*fp->f_ops->fo_close)(fp);
-       crfree(fp->f_cred);
-       fp->f_count = 0;
+       if ((fp->f_flag & FHASLOCK) && fp->f_type == DTYPE_VNODE) {
+               lf.l_whence = SEEK_SET;
+               lf.l_start = 0;
+               lf.l_len = 0;
+               lf.l_type = F_UNLCK;
+               vp = (struct vnode *)fp->f_data;
+               (void) VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK);
+       }
+       if (fp->f_ops)
+               error = (*fp->f_ops->fo_close)(fp, p);
+       else
+               error = 0;
+       ffree(fp);

        return (error);
 }
 
        return (error);
 }
 


@@ -623,24 +778,25 @@ closef(fp, p)
  * Just attempt to get a record lock of the requested type on
  * the entire file (l_whence = SEEK_SET, l_start = 0, l_len = 0).
  */
  * Just attempt to get a record lock of the requested type on
  * the entire file (l_whence = SEEK_SET, l_start = 0, l_len = 0).
  */

-

 /* ARGSUSED */
 /* ARGSUSED */

+int

 flock(p, uap, retval)
        struct proc *p;
 flock(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               int     how;
-       } *uap;
-       int *retval;
+       register struct flock_args /* {
+               syscallarg(int) fd;
+               syscallarg(int) how;
+       } */ *uap;
+       register_t *retval;

 {
 {

+       int fd = SCARG(uap, fd);
+       int how = SCARG(uap, how);

        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        struct vnode *vp;
        struct flock lf;
        register struct filedesc *fdp = p->p_fd;
        register struct file *fp;
        struct vnode *vp;
        struct flock lf;

-       int error;

 
 

-       if ((unsigned)uap->fd >= fdp->fd_nfiles ||
-           (fp = fdp->fd_ofiles[uap->fd]) == NULL)
+       if ((u_int)fd >= fdp->fd_nfiles ||
+           (fp = fdp->fd_ofiles[fd]) == NULL)

                return (EBADF);
        if (fp->f_type != DTYPE_VNODE)
                return (EOPNOTSUPP);
                return (EBADF);
        if (fp->f_type != DTYPE_VNODE)
                return (EOPNOTSUPP);


@@ -648,19 +804,21 @@ flock(p, uap, retval)
        lf.l_whence = SEEK_SET;
        lf.l_start = 0;
        lf.l_len = 0;
        lf.l_whence = SEEK_SET;
        lf.l_start = 0;
        lf.l_len = 0;

-       if (uap->how & LOCK_UN) {
+       if (how & LOCK_UN) {

                lf.l_type = F_UNLCK;
                lf.l_type = F_UNLCK;

-               return (VOP_ADVLOCK(vp, fp, F_UNLCK, &lf, F_FLOCK));
+               fp->f_flag &= ~FHASLOCK;
+               return (VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK));

        }
        }

-       if (uap->how & LOCK_EX)
+       if (how & LOCK_EX)

                lf.l_type = F_WRLCK;
                lf.l_type = F_WRLCK;

-       else if (uap->how & LOCK_SH)
+       else if (how & LOCK_SH)

                lf.l_type = F_RDLCK;
        else
                return (EBADF);
                lf.l_type = F_RDLCK;
        else
                return (EBADF);

-       if (uap->how & LOCK_NB)
-               return (VOP_ADVLOCK(vp, fp, F_SETLK, &lf, F_FLOCK));
-       return (VOP_ADVLOCK(vp, fp, F_SETLK, &lf, F_FLOCK|F_WAIT));
+       fp->f_flag |= FHASLOCK;
+       if (how & LOCK_NB)
+               return (VOP_ADVLOCK(vp, (caddr_t)fp, F_SETLK, &lf, F_FLOCK));
+       return (VOP_ADVLOCK(vp, (caddr_t)fp, F_SETLK, &lf, F_FLOCK|F_WAIT));

 }
 
 /*
 }
 
 /*


@@ -672,9 +830,11 @@ flock(p, uap, retval)
  * references to this file will be direct to the other driver.
  */
 /* ARGSUSED */
  * references to this file will be direct to the other driver.
  */
 /* ARGSUSED */

-fdopen(dev, mode, type)
+int
+fdopen(dev, mode, type, p)

        dev_t dev;
        int mode, type;
        dev_t dev;
        int mode, type;

+       struct proc *p;

 {
 
        /*
 {
 
        /*


@@ -685,21 +845,23 @@ fdopen(dev, mode, type)
         * actions in dupfdopen below. Other callers of vn_open or VOP_OPEN
         * will simply report the error.
         */
         * actions in dupfdopen below. Other callers of vn_open or VOP_OPEN
         * will simply report the error.
         */

-       curproc->p_dupfd = minor(dev);          /* XXX */
+       p->p_dupfd = minor(dev);

        return (ENODEV);
 }
 
 /*
  * Duplicate the specified descriptor to a free descriptor.
  */
        return (ENODEV);
 }
 
 /*
  * Duplicate the specified descriptor to a free descriptor.
  */

-dupfdopen(fdp, indx, dfd, mode)
+int
+dupfdopen(fdp, indx, dfd, mode, error)

        register struct filedesc *fdp;
        register int indx, dfd;
        int mode;
        register struct filedesc *fdp;
        register int indx, dfd;
        int mode;

+       int error;

 {
        register struct file *wfp;
        struct file *fp;
 {
        register struct file *wfp;
        struct file *fp;

-       
+

        /*
         * If the to-be-dup'd fd number is greater than the allowed number
         * of file descriptors, or the fd to be dup'd has already been
        /*
         * If the to-be-dup'd fd number is greater than the allowed number
         * of file descriptors, or the fd to be dup'd has already been


@@ -713,15 +875,56 @@ dupfdopen(fdp, indx, dfd, mode)
                return (EBADF);
 
        /*
                return (EBADF);
 
        /*

-        * Check that the mode the file is being opened for is a subset 
-        * of the mode of the existing descriptor.
+        * There are two cases of interest here.
+        *
+        * For ENODEV simply dup (dfd) to file descriptor
+        * (indx) and return.
+        *
+        * For ENXIO steal away the file structure from (dfd) and
+        * store it in (indx).  (dfd) is effectively closed by
+        * this operation.
+        *
+        * Any other error code is just returned.

         */
         */

-       if (((mode & (FREAD|FWRITE)) | wfp->f_flag) != wfp->f_flag)
-               return (EACCES);
-       fdp->fd_ofiles[indx] = wfp;
-       fdp->fd_ofileflags[indx] = fdp->fd_ofileflags[dfd];
-       wfp->f_count++;
-       if (indx > fdp->fd_lastfile)
-               fdp->fd_lastfile = indx;
-       return (0);
+       switch (error) {
+       case ENODEV:
+               /*
+                * Check that the mode the file is being opened for is a
+                * subset of the mode of the existing descriptor.
+                */
+               if (((mode & (FREAD|FWRITE)) | wfp->f_flag) != wfp->f_flag)
+                       return (EACCES);
+               fdp->fd_ofiles[indx] = wfp;
+               fdp->fd_ofileflags[indx] = fdp->fd_ofileflags[dfd];
+               wfp->f_count++;
+               if (indx > fdp->fd_lastfile)
+                       fdp->fd_lastfile = indx;
+               return (0);
+
+       case ENXIO:
+               /*
+                * Steal away the file pointer from dfd, and stuff it into indx.
+                */
+               fdp->fd_ofiles[indx] = fdp->fd_ofiles[dfd];
+               fdp->fd_ofiles[dfd] = NULL;
+               fdp->fd_ofileflags[indx] = fdp->fd_ofileflags[dfd];
+               fdp->fd_ofileflags[dfd] = 0;
+               /*
+                * Complete the clean up of the filedesc structure by
+                * recomputing the various hints.
+                */
+               if (indx > fdp->fd_lastfile)
+                       fdp->fd_lastfile = indx;
+               else
+                       while (fdp->fd_lastfile > 0 &&
+                              fdp->fd_ofiles[fdp->fd_lastfile] == NULL)
+                               fdp->fd_lastfile--;
+                       if (dfd < fdp->fd_freefile)
+                               fdp->fd_freefile = dfd;
+               return (0);
+
+       default:
+               return (error);
+       }
+       /* NOTREACHED */

 }
 }