X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/88a7a62ac37860454424240400aa10e0319144c7..a18538c92b3fbcaa835cae4bc38a5b50faa13519:/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 81b5652784..2c6c0ffffb 100644
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -1,362 +1,834 @@
-/*	kern_descrip.c	5.24	83/05/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/conf.h"
-#include "../h/file.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
-
-#include "../h/ioctl.h"
-
 /*
- * Descriptor management.
+ * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *	@(#)kern_descrip.c	7.37 (Berkeley) %G%
  */
 
+#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"
+
 /*
- * TODO:
- *	increase NOFILE
- *	eliminate u.u_error side effects
+ * Descriptor management.
  */
+struct file *filehead;	/* head of list of open files */
+int nfiles;		/* actual number of open files */
 
 /*
  * System calls on descriptors.
  */
-getdtablesize()
-{
-
-	u.u_r.r_val1 = NOFILE;
-}
-
-getdopt()
-{
-
-}
-
-setdopt()
+struct getdtablesize_args {
+	int	dummy;
+};
+/* ARGSUSED */
+getdtablesize(p, uap, retval)
+	struct proc *p;
+	struct getdtablesize_args *uap;
+	int *retval;
 {
 
+	*retval = p->p_rlimit[RLIMIT_OFILE].rlim_cur;
+	return (0);
 }
 
-dup()
+/*
+ * Duplicate a file descriptor.
+ */
+struct dup_args {
+	int	i;
+};
+/* ARGSUSED */
+dup(p, uap, retval)
+	struct proc *p;
+	struct dup_args *uap;
+	int *retval;
 {
-	register struct a {
-		int	i;
-	} *uap = (struct a *) u.u_ap;
+	register struct filedesc *fdp = p->p_fd;
 	struct file *fp;
-	int j;
+	int fd, error;
 
-	if (uap->i &~ 077) { uap->i &= 077; dup2(); return; }	/* XXX */
+	/*
+	 * XXX Compatibility
+	 */
+	if (uap->i &~ 077) { uap->i &= 077; return (dup2(p, uap, retval)); }
 
-	fp = getf(uap->i);
-	if (fp == 0)
-		return;
-	j = ufalloc(0);
-	if (j < 0)
-		return;
-	dupit(j, fp, u.u_pofile[uap->i]);
+	if ((unsigned)uap->i >= fdp->fd_nfiles ||
+	    (fp = fdp->fd_ofiles[uap->i]) == NULL)
+		return (EBADF);
+	if (error = fdalloc(p, 0, &fd))
+		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);
 }
 
-dup2()
+/*
+ * Duplicate a file descriptor to a particular value.
+ */
+struct dup2_args {
+	u_int	from;
+	u_int	to;
+};
+/* ARGSUSED */
+dup2(p, uap, retval)
+	struct proc *p;
+	struct dup2_args *uap;
+	int *retval;
 {
-	register struct a {
-		int	i, j;
-	} *uap = (struct a *) u.u_ap;
+	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
-
-	fp = getf(uap->i);
-	if (fp == 0)
-		return;
-	if (uap->j < 0 || uap->j >= NOFILE) {
-		u.u_error = EBADF;
-		return;
-	}
-	u.u_r.r_val1 = uap->j;
-	if (uap->i == uap->j)
-		return;
-	if (u.u_ofile[uap->j]) {
-		if (u.u_pofile[uap->j] & UF_MAPPED)
-			munmapfd(uap->j);
-		closef(u.u_ofile[uap->j], u.u_pofile[uap->j]);
-		if (u.u_error)
-			return;
-		/* u.u_ofile[uap->j] = 0; */
-		/* u.u_pofile[uap->j] = 0; */
+	register u_int old = uap->from, new = uap->to;
+	int i, error;
+
+	if (old >= fdp->fd_nfiles ||
+	    (fp = fdp->fd_ofiles[old]) == NULL ||
+	    new >= p->p_rlimit[RLIMIT_OFILE].rlim_cur)
+		return (EBADF);
+	*retval = new;
+	if (old == new)
+		return (0);
+	if (new >= fdp->fd_nfiles) {
+		if (error = fdalloc(p, new, &i))
+			return (error);
+		if (new != i)
+			panic("dup2: fdalloc");
+	} else if (fdp->fd_ofiles[new]) {
+		if (fdp->fd_ofileflags[new] & UF_MAPPED)
+			(void) munmapfd(p, new);
+		/*
+		 * dup2() must succeed even if the close has an error.
+		 */
+		(void) closef(fdp->fd_ofiles[new], p);
 	}
-	dupit(uap->j, fp, u.u_pofile[uap->i]);
-}
-
-dupit(fd, fp, lockflags)
-	int fd;
-	register struct file *fp;
-	register int lockflags;
-{
-
-	u.u_ofile[fd] = fp;
-	u.u_pofile[fd] = lockflags;
+	fdp->fd_ofiles[new] = fp;
+	fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE;
 	fp->f_count++;
-/* THIS DOESN'T BELONG HERE */
-	if (lockflags&UF_SHLOCK)
-		((struct inode *)fp->f_data)->i_shlockc++;
-	if (lockflags&UF_EXLOCK)
-		((struct inode *)fp->f_data)->i_exlockc++;
-/* END DOESN'T BELONG */
+	if (new > fdp->fd_lastfile)
+		fdp->fd_lastfile = new;
+	return (0);
 }
 
 /*
  * The file control system call.
  */
-fcntl()
+struct fcntl_args {
+	int	fd;
+	int	cmd;
+	int	arg;
+};
+/* ARGSUSED */
+fcntl(p, uap, retval)
+	struct proc *p;
+	register struct fcntl_args *uap;
+	int *retval;
 {
+	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
-	register struct a {
-		int	fdes;
-		int	cmd;
-		int	arg;
-	} *uap;
-	register i;
 	register char *pop;
-
-	uap = (struct a *)u.u_ap;
-	fp = getf(uap->fdes);
-	if (fp == NULL)
-		return;
-	pop = &u.u_pofile[uap->fdes];
+	struct vnode *vp;
+	int i, tmp, error, flg = F_POSIX;
+	struct flock fl;
+
+	if ((unsigned)uap->fd >= fdp->fd_nfiles ||
+	    (fp = fdp->fd_ofiles[uap->fd]) == NULL)
+		return (EBADF);
+	pop = &fdp->fd_ofileflags[uap->fd];
 	switch(uap->cmd) {
-	case 0:
-		i = uap->arg;
-		if (i < 0 || i > NOFILE) {
-			u.u_error = EINVAL;
-			return;
-		}
-		if ((i = ufalloc(i)) < 0)
-			return;
-		dupit(i, fp, *pop);
-		break;
+	case F_DUPFD:
+		if ((unsigned)uap->arg >= p->p_rlimit[RLIMIT_OFILE].rlim_cur)
+			return (EINVAL);
+		if (error = fdalloc(p, uap->arg, &i))
+			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);
 
-	case 1:
-		u.u_r.r_val1 = *pop & 1;
-		break;
+	case F_GETFD:
+		*retval = *pop & 1;
+		return (0);
 
-	case 2:
+	case F_SETFD:
 		*pop = (*pop &~ 1) | (uap->arg & 1);
-		break;
+		return (0);
 
-	case 3:
-		u.u_r.r_val1 = fp->f_flag+FOPEN;
-		break;
+	case F_GETFL:
+		*retval = OFLAGS(fp->f_flag);
+		return (0);
 
-	case 4:
-		fp->f_flag &= FCNTLCANT;
-		fp->f_flag |= (uap->arg-FOPEN) &~ FCNTLCANT;
-		u.u_error = fset(fp, FNDELAY, fp->f_flag & FNDELAY);
-		if (u.u_error)
-			break;
-		u.u_error = fset(fp, FASYNC, fp->f_flag & FASYNC);
-		if (u.u_error)
-			(void) fset(fp, FNDELAY, 0);
-		break;
+	case F_SETFL:
+		fp->f_flag &= ~FCNTLFLAGS;
+		fp->f_flag |= FFLAGS(uap->arg) & FCNTLFLAGS;
+		tmp = fp->f_flag & FNONBLOCK;
+		error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, (caddr_t)&tmp, p);
+		if (error)
+			return (error);
+		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 5:
-		u.u_error = fsetown(fp, uap->arg);
-		break;
+	case F_GETOWN:
+		if (fp->f_type == DTYPE_SOCKET) {
+			*retval = ((struct socket *)fp->f_data)->so_pgid;
+			return (0);
+		}
+		error = (*fp->f_ops->fo_ioctl)
+			(fp, (int)TIOCGPGRP, (caddr_t)retval, p);
+		*retval = -*retval;
+		return (error);
 
-	case 6:
-		u.u_error = fgetown(fp, &u.u_r.r_val1);
-		break;
+	case F_SETOWN:
+		if (fp->f_type == DTYPE_SOCKET) {
+			((struct socket *)fp->f_data)->so_pgid = uap->arg;
+			return (0);
+		}
+		if (uap->arg <= 0) {
+			uap->arg = -uap->arg;
+		} else {
+			struct proc *p1 = pfind(uap->arg);
+			if (p1 == 0)
+				return (ESRCH);
+			uap->arg = p1->p_pgrp->pg_id;
+		}
+		return ((*fp->f_ops->fo_ioctl)
+			(fp, (int)TIOCSPGRP, (caddr_t)&uap->arg, p));
+
+	case F_SETLKW:
+		flg |= F_WAIT;
+		/* Fall into F_SETLK */
+
+	case F_SETLK:
+		if (fp->f_type != DTYPE_VNODE)
+			return (EBADF);
+		vp = (struct vnode *)fp->f_data;
+		/* Copy in the lock structure */
+		error = copyin((caddr_t)uap->arg, (caddr_t)&fl, sizeof (fl));
+		if (error)
+			return (error);
+		if (fl.l_whence == SEEK_CUR)
+			fl.l_start += fp->f_offset;
+		switch (fl.l_type) {
+
+		case F_RDLCK:
+			if ((fp->f_flag & FREAD) == 0)
+				return (EBADF);
+			p->p_flag |= SADVLCK;
+			return (VOP_ADVLOCK(vp, (caddr_t)p, F_SETLK, &fl, flg));
+
+		case F_WRLCK:
+			if ((fp->f_flag & FWRITE) == 0)
+				return (EBADF);
+			p->p_flag |= SADVLCK;
+			return (VOP_ADVLOCK(vp, (caddr_t)p, F_SETLK, &fl, flg));
+
+		case F_UNLCK:
+			return (VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &fl,
+				F_POSIX));
+
+		default:
+			return (EINVAL);
+		}
+
+	case F_GETLK:
+		if (fp->f_type != DTYPE_VNODE)
+			return (EBADF);
+		vp = (struct vnode *)fp->f_data;
+		/* Copy in the lock structure */
+		error = copyin((caddr_t)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 = VOP_ADVLOCK(vp, (caddr_t)p, F_GETLK, &fl, F_POSIX))
+			return (error);
+		return (copyout((caddr_t)&fl, (caddr_t)uap->arg, sizeof (fl)));
 
 	default:
-		u.u_error = EINVAL;
+		return (EINVAL);
 	}
+	/* NOTREACHED */
 }
 
-fset(fp, bit, value)
-	struct file *fp;
-	int bit, value;
+/*
+ * Close a file descriptor.
+ */
+struct close_args {
+	int	fd;
+};
+/* ARGSUSED */
+close(p, uap, retval)
+	struct proc *p;
+	struct close_args *uap;
+	int *retval;
 {
-
-	if (value)
-		fp->f_flag |= bit;
-	else
-		fp->f_flag &= ~bit;
-	return (fioctl(fp, (int)(bit == FNDELAY ? FIONBIO : FIOASYNC),
-	    (caddr_t)&value));
+	register struct filedesc *fdp = p->p_fd;
+	register struct file *fp;
+	register int fd = uap->fd;
+	register u_char *pf;
+
+	if ((unsigned)fd >= fdp->fd_nfiles ||
+	    (fp = fdp->fd_ofiles[fd]) == NULL)
+		return (EBADF);
+	pf = (u_char *)&fdp->fd_ofileflags[fd];
+	if (*pf & UF_MAPPED)
+		(void) munmapfd(p, fd);
+	fdp->fd_ofiles[fd] = NULL;
+	while (fdp->fd_lastfile > 0 && fdp->fd_ofiles[fdp->fd_lastfile] == NULL)
+		fdp->fd_lastfile--;
+	if (fd < fdp->fd_freefile)
+		fdp->fd_freefile = fd;
+	*pf = 0;
+	return (closef(fp, p));
 }
 
-fgetown(fp, valuep)
-	struct file *fp;
-	int *valuep;
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+/*
+ * Return status information about a file descriptor.
+ */
+struct ofstat_args {
+	int	fd;
+	struct	ostat *sb;
+};
+/* ARGSUSED */
+ofstat(p, uap, retval)
+	struct proc *p;
+	register struct ofstat_args *uap;
+	int *retval;
 {
+	register struct filedesc *fdp = p->p_fd;
+	register struct file *fp;
+	struct stat ub;
+	struct ostat oub;
 	int error;
 
+	if ((unsigned)uap->fd >= fdp->fd_nfiles ||
+	    (fp = fdp->fd_ofiles[uap->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:
-		*valuep = ((struct socket *)fp->f_data)->so_pgrp;
-		return (0);
+		error = soo_stat((struct socket *)fp->f_data, &ub);
+		break;
 
 	default:
-		error = fioctl(fp, (int)TIOCGPGRP, (caddr_t)valuep);
-		*valuep = -*valuep;
-		return (error);
+		panic("ofstat");
+		/*NOTREACHED*/
 	}
+	cvtstat(&ub, &oub);
+	if (error == 0)
+		error = copyout((caddr_t)&oub, (caddr_t)uap->sb, sizeof (oub));
+	return (error);
 }
+#endif /* COMPAT_43 || COMPAT_SUNOS */
 
-fsetown(fp, value)
-	struct file *fp;
-	int value;
+/*
+ * Return status information about a file descriptor.
+ */
+struct fstat_args {
+	int	fd;
+	struct	stat *sb;
+};
+/* ARGSUSED */
+fstat(p, uap, retval)
+	struct proc *p;
+	register struct fstat_args *uap;
+	int *retval;
 {
+	register struct filedesc *fdp = p->p_fd;
+	register struct file *fp;
+	struct stat ub;
+	int error;
 
-	if (fp->f_type == DTYPE_SOCKET) {
-		((struct socket *)fp->f_data)->so_pgrp = value;
-		return (0);
+	if ((unsigned)uap->fd >= fdp->fd_nfiles ||
+	    (fp = fdp->fd_ofiles[uap->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("fstat");
+		/*NOTREACHED*/
 	}
-	if (value > 0) {
-		struct proc *p = pfind(value);
-		if (p == 0)
-			return (EINVAL);
-		value = p->p_pgrp;
-	} else
-		value = -value;
-	return (fioctl(fp, (int)TIOCSPGRP, (caddr_t)&value));
+	if (error == 0)
+		error = copyout((caddr_t)&ub, (caddr_t)uap->sb, sizeof (ub));
+	return (error);
 }
 
-fioctl(fp, cmd, value)
-	struct file *fp;
-	int cmd;
-	caddr_t value;
+/*
+ * Allocate a file descriptor for the process.
+ */
+int fdexpand;
+
+fdalloc(p, want, result)
+	struct proc *p;
+	int want;
+	int *result;
 {
+	register struct filedesc *fdp = p->p_fd;
+	register int i;
+	int lim, last, nfiles;
+	struct file **newofile;
+	char *newofileflags;
+
+	/*
+	 * Search for a free descriptor starting at the higher
+	 * of want or fd_freefile.  If that fails, consider
+	 * expanding the ofile array.
+	 */
+	lim = p->p_rlimit[RLIMIT_OFILE].rlim_cur;
+	for (;;) {
+		last = min(fdp->fd_nfiles, lim);
+		if ((i = want) < fdp->fd_freefile)
+			i = fdp->fd_freefile;
+		for (; i < last; i++) {
+			if (fdp->fd_ofiles[i] == NULL) {
+				fdp->fd_ofileflags[i] = 0;
+				if (i > fdp->fd_lastfile)
+					fdp->fd_lastfile = i;
+				if (want <= fdp->fd_freefile)
+					fdp->fd_freefile = i;
+				*result = i;
+				return (0);
+			}
+		}
 
-	return ((*fp->f_ops->fo_ioctl)(fp, cmd, value));
+		/*
+		 * No space in current array.  Expand?
+		 */
+		if (fdp->fd_nfiles >= lim)
+			return (EMFILE);
+		if (fdp->fd_nfiles < NDEXTENT)
+			nfiles = NDEXTENT;
+		else
+			nfiles = 2 * fdp->fd_nfiles;
+		MALLOC(newofile, struct file **, nfiles * OFILESIZE,
+		    M_FILEDESC, M_WAITOK);
+		newofileflags = (char *) &newofile[nfiles];
+		/*
+		 * Copy the existing ofile and ofileflags arrays
+		 * and zero the new portion of each array.
+		 */
+		bcopy(fdp->fd_ofiles, newofile,
+			(i = sizeof(struct file *) * fdp->fd_nfiles));
+		bzero((char *)newofile + i, nfiles * sizeof(struct file *) - i);
+		bcopy(fdp->fd_ofileflags, newofileflags,
+			(i = sizeof(char) * fdp->fd_nfiles));
+		bzero(newofileflags + i, nfiles * sizeof(char) - i);
+		if (fdp->fd_nfiles > NDFILE)
+			FREE(fdp->fd_ofiles, M_FILEDESC);
+		fdp->fd_ofiles = newofile;
+		fdp->fd_ofileflags = newofileflags;
+		fdp->fd_nfiles = nfiles;
+		fdexpand++;
+	}
 }
 
-close()
+/*
+ * Check to see whether n user file descriptors
+ * are available to the process p.
+ */
+fdavail(p, n)
+	struct proc *p;
+	register int n;
 {
-	register struct a {
-		int	i;
-	} *uap = (struct a *)u.u_ap;
-	register struct file *fp;
+	register struct filedesc *fdp = p->p_fd;
+	register struct file **fpp;
+	register int i;
 
-	fp = getf(uap->i);
-	if (fp == 0)
-		return;
-	if (u.u_pofile[uap->i] & UF_MAPPED)
-		munmapfd(uap->i);
-	closef(fp, u.u_pofile[uap->i]);
-	/* WHAT IF u.u_error ? */
-	u.u_ofile[uap->i] = NULL;
-	u.u_pofile[uap->i] = 0;
+	if ((i = p->p_rlimit[RLIMIT_OFILE].rlim_cur - 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++)
+		if (*fpp == NULL && --n <= 0)
+			return (1);
+	return (0);
 }
 
 /*
- * Allocate a user file descriptor.
+ * Create a new open file structure and allocate
+ * a file decriptor for the process that refers to it.
  */
-ufalloc(i)
-	register int i;
+falloc(p, resultfp, resultfd)
+	register struct proc *p;
+	struct file **resultfp;
+	int *resultfd;
 {
+	register struct file *fp, *fq, **fpp;
+	int error, i;
 
-	for (; i < NOFILE; i++)
-		if (u.u_ofile[i] == NULL) {
-			u.u_r.r_val1 = i;
-			u.u_pofile[i] = 0;
-			return (i);
-		}
-	u.u_error = EMFILE;
-	return (-1);
+	if (error = fdalloc(p, 0, &i))
+		return (error);
+	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);
+	if (fq = p->p_fd->fd_ofiles[0])
+		fpp = &fq->f_filef;
+	else
+		fpp = &filehead;
+	p->p_fd->fd_ofiles[i] = fp;
+	if (fq = *fpp)
+		fq->f_fileb = &fp->f_filef;
+	fp->f_filef = fq;
+	fp->f_fileb = fpp;
+	*fpp = fp;
+	fp->f_count = 1;
+	fp->f_msgcount = 0;
+	fp->f_offset = 0;
+	fp->f_cred = p->p_ucred;
+	crhold(fp->f_cred);
+	if (resultfp)
+		*resultfp = fp;
+	if (resultfd)
+		*resultfd = i;
+	return (0);
 }
 
-ufavail()
+/*
+ * Free a file descriptor.
+ */
+ffree(fp)
+	register struct file *fp;
 {
-	register int i, avail = 0;
-
-	for (i = 0; i < NOFILE; i++)
-		if (u.u_ofile[i] == NULL)
-			avail++;
-	return (avail);
+	register struct file *fq;
+
+	if (fq = fp->f_filef)
+		fq->f_fileb = fp->f_fileb;
+	*fp->f_fileb = fq;
+	crfree(fp->f_cred);
+#ifdef DIAGNOSTIC
+	fp->f_filef = NULL;
+	fp->f_fileb = NULL;
+	fp->f_count = 0;
+#endif
+	nfiles--;
+	FREE(fp, M_FILE);
 }
 
-struct	file *lastf;
 /*
- * Allocate a user file descriptor
- * and a file structure.
- * Initialize the descriptor
- * to point at the file structure.
+ * Copy a filedesc structure.
  */
-struct file *
-falloc()
+struct filedesc *
+fdcopy(p)
+	struct proc *p;
 {
-	register struct file *fp;
-	register i;
-
-	i = ufalloc(0);
-	if (i < 0)
-		return (NULL);
-	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");
-	u.u_error = ENFILE;
-	return (NULL);
-slot:
-	u.u_ofile[i] = fp;
-	fp->f_count = 1;
-	fp->f_data = 0;
-	fp->f_offset = 0;
-	lastf = fp + 1;
-	return (fp);
+	register struct filedesc *newfdp, *fdp = p->p_fd;
+	register struct file **fpp;
+	register int i;
+
+	MALLOC(newfdp, struct filedesc *, sizeof(struct filedesc0),
+	    M_FILEDESC, M_WAITOK);
+	bcopy(fdp, newfdp, sizeof(struct filedesc));
+	VREF(newfdp->fd_cdir);
+	if (newfdp->fd_rdir)
+		VREF(newfdp->fd_rdir);
+	newfdp->fd_refcnt = 1;
+
+	/*
+	 * If the number of open files fits in the internal arrays
+	 * of the open file structure, use them, otherwise allocate
+	 * additional memory for the number of descriptors currently
+	 * in use.
+	 */
+	if (newfdp->fd_lastfile < NDFILE) {
+		newfdp->fd_ofiles = ((struct filedesc0 *) newfdp)->fd_dfiles;
+		newfdp->fd_ofileflags =
+		    ((struct filedesc0 *) newfdp)->fd_dfileflags;
+		i = NDFILE;
+	} else {
+		/*
+		 * Compute the smallest multiple of NDEXTENT needed
+		 * for the file descriptors currently in use,
+		 * allowing the table to shrink.
+		 */
+		i = newfdp->fd_nfiles;
+		while (i > 2 * NDEXTENT && i >= newfdp->fd_lastfile * 2)
+			i /= 2;
+		MALLOC(newfdp->fd_ofiles, struct file **, i * OFILESIZE,
+		    M_FILEDESC, M_WAITOK);
+		newfdp->fd_ofileflags = (char *) &newfdp->fd_ofiles[i];
+	}
+	newfdp->fd_nfiles = i;
+	bcopy(fdp->fd_ofiles, newfdp->fd_ofiles, i * sizeof(struct file **));
+	bcopy(fdp->fd_ofileflags, newfdp->fd_ofileflags, i * sizeof(char));
+	fpp = newfdp->fd_ofiles;
+	for (i = newfdp->fd_lastfile; i-- >= 0; fpp++)
+		if (*fpp != NULL)
+			(*fpp)->f_count++;
+	return (newfdp);
 }
 
 /*
- * Convert a user supplied file descriptor into a pointer
- * to a file structure.  Only task is to check range of the descriptor.
- * Critical paths should use the GETF macro.
+ * Release a filedesc structure.
  */
-struct file *
-getf(f)
-	register int f;
+void
+fdfree(p)
+	struct proc *p;
 {
-	register struct file *fp;
+	register struct filedesc *fdp = p->p_fd;
+	struct file **fpp;
+	register int i;
 
-	if ((unsigned)f >= NOFILE || (fp = u.u_ofile[f]) == NULL) {
-		u.u_error = EBADF;
-		return (NULL);
-	}
-	return (fp);
+	if (--fdp->fd_refcnt > 0)
+		return;
+	fpp = fdp->fd_ofiles;
+	for (i = fdp->fd_lastfile; i-- >= 0; fpp++)
+		if (*fpp)
+			(void) closef(*fpp, p);
+	if (fdp->fd_nfiles > NDFILE)
+		FREE(fdp->fd_ofiles, M_FILEDESC);
+	vrele(fdp->fd_cdir);
+	if (fdp->fd_rdir)
+		vrele(fdp->fd_rdir);
+	FREE(fdp, M_FILEDESC);
 }
 
 /*
  * Internal form of close.
  * Decrement reference count on file structure.
- * If last reference not going away, but no more
- * references except in message queues, run a
- * garbage collect.  This would better be done by
- * forcing a gc() to happen sometime soon, rather
- * than running one each time.
+ * Note: p may be NULL when closing a file
+ * that was being passed in a message.
  */
-closef(fp, flags)
+closef(fp, p)
 	register struct file *fp;
-	int flags;					/* XXX */
+	register struct proc *p;
 {
+	struct vnode *vp;
+	struct flock lf;
+	int error;
 
 	if (fp == NULL)
-		return;
-	if (fp->f_count > 1) {
-		fp->f_count--;
-		if (fp->f_count == fp->f_msgcount)
-			unp_gc();
-		return;
+		return (0);
+	/*
+	 * POSIX record locking dictates that any close releases ALL
+	 * 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 (p && (p->p_flag & SADVLCK) && 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)p, F_UNLCK, &lf, F_POSIX);
 	}
-	(*fp->f_ops->fo_close)(fp, flags);
-	fp->f_count = 0;
+	if (--fp->f_count > 0)
+		return (0);
+	if (fp->f_count < 0)
+		panic("closef: 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);
+	}
+	error = (*fp->f_ops->fo_close)(fp, p);
+	ffree(fp);
+	return (error);
+}
+
+/*
+ * Apply an advisory lock on a file descriptor.
+ *
+ * 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).
+ */
+struct flock_args {
+	int	fd;
+	int	how;
+};
+/* ARGSUSED */
+flock(p, uap, retval)
+	struct proc *p;
+	register struct flock_args *uap;
+	int *retval;
+{
+	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)
+		return (EBADF);
+	if (fp->f_type != DTYPE_VNODE)
+		return (EOPNOTSUPP);
+	vp = (struct vnode *)fp->f_data;
+	lf.l_whence = SEEK_SET;
+	lf.l_start = 0;
+	lf.l_len = 0;
+	if (uap->how & LOCK_UN) {
+		lf.l_type = F_UNLCK;
+		fp->f_flag &= ~FHASLOCK;
+		return (VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK));
+	}
+	if (uap->how & LOCK_EX)
+		lf.l_type = F_WRLCK;
+	else if (uap->how & LOCK_SH)
+		lf.l_type = F_RDLCK;
+	else
+		return (EBADF);
+	fp->f_flag |= FHASLOCK;
+	if (uap->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));
+}
+
+/*
+ * File Descriptor pseudo-device driver (/dev/fd/).
+ *
+ * Opening minor device N dup()s the file (if any) connected to file
+ * descriptor N belonging to the calling process.  Note that this driver
+ * consists of only the ``open()'' routine, because all subsequent
+ * references to this file will be direct to the other driver.
+ */
+/* ARGSUSED */
+fdopen(dev, mode, type, p)
+	dev_t dev;
+	int mode, type;
+	struct proc *p;
+{
+
+	/*
+	 * XXX Kludge: set curproc->p_dupfd to contain the value of the
+	 * the file descriptor being sought for duplication. The error 
+	 * return ensures that the vnode for this device will be released
+	 * by vn_open. Open will detect this special error and take the
+	 * actions in dupfdopen below. Other callers of vn_open or VOP_OPEN
+	 * will simply report the error.
+	 */
+	p->p_dupfd = minor(dev);
+	return (ENODEV);
+}
+
+/*
+ * Duplicate the specified descriptor to a free descriptor.
+ */
+dupfdopen(fdp, indx, dfd, mode, error)
+	register struct filedesc *fdp;
+	register int indx, dfd;
+	int mode;
+	int error;
+{
+	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
+	 * closed, reject.  Note, check for new == old is necessary as
+	 * falloc could allocate an already closed to-be-dup'd descriptor
+	 * as the new descriptor.
+	 */
+	fp = fdp->fd_ofiles[indx];
+	if ((u_int)dfd >= fdp->fd_nfiles ||
+	    (wfp = fdp->fd_ofiles[dfd]) == NULL || fp == wfp)
+		return (EBADF);
+
+	/*
+	 * 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.
+	 */
+	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 */
 }