X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/c05c252845996d0766b9bfb99afbaa6bbb9e13a5..8429d0227448605965610a9e25ac573e07e17507:/usr/src/sys/kern/kern_descrip.c?ds=inline

diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index 907159f87e..22d0bf3f5a 100644
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -1,166 +1,241 @@
-/*	kern_descrip.c	6.7	84/11/27	*/
+/*
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *	@(#)kern_descrip.c	7.21 (Berkeley) %G%
+ */
 
 #include "param.h"
 #include "systm.h"
-#include "dir.h"
 #include "user.h"
+#include "filedesc.h"
 #include "kernel.h"
-#include "inode.h"
+#include "vnode.h"
 #include "proc.h"
-#include "conf.h"
 #include "file.h"
 #include "socket.h"
 #include "socketvar.h"
-#include "mount.h"
 #include "stat.h"
-
 #include "ioctl.h"
+#include "fcntl.h"
+#include "malloc.h"
+#include "syslog.h"
 
 /*
  * Descriptor management.
  */
 
-/*
- * TODO:
- *	increase NOFILE
- *	eliminate u.u_error side effects
- */
-
 /*
  * System calls on descriptors.
  */
-getdtablesize()
+/* ARGSUSED */
+getdtablesize(p, uap, retval)
+	struct proc *p;
+	struct args *uap;
+	int *retval;
 {
 
-	u.u_r.r_val1 = NOFILE;
+	*retval = p->p_rlimit[RLIMIT_OFILE].rlim_cur;
+	return (0);
 }
 
-getdopt()
-{
-
-}
-
-setdopt()
-{
-
-}
-
-dup()
-{
-	register struct a {
+/*
+ * Duplicate a file descriptor.
+ */
+/* ARGSUSED */
+dup(p, uap, retval)
+	struct proc *p;
+	struct args {
 		int	i;
-	} *uap = (struct a *) u.u_ap;
+	} *uap;
+	int *retval;
+{
+	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)); }
 
-	GETF(fp, uap->i);
-	j = ufalloc(0);
-	if (j < 0)
-		return;
-	dupit(j, fp, u.u_pofile[uap->i] &~ UF_EXCLOSE);
+	if ((unsigned)uap->i >= fdp->fd_nfiles ||
+	    (fp = OFILE(fdp, uap->i)) == NULL)
+		return (EBADF);
+	if (error = fdalloc(p, 0, &fd))
+		return (error);
+	OFILE(fdp, fd) = fp;
+	OFILEFLAGS(fdp, fd) = OFILEFLAGS(fdp, 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.
+ */
+/* ARGSUSED */
+dup2(p, uap, retval)
+	struct proc *p;
+	register struct args {
+		int	i;
+		int	j;
+	} *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;
+	int i, error;
 
-	GETF(fp, uap->i);
-	if (uap->j < 0 || uap->j >= NOFILE) {
-		u.u_error = EBADF;
-		return;
-	}
-	u.u_r.r_val1 = uap->j;
+	if ((unsigned)uap->i >= fdp->fd_nfiles ||
+	    (fp = OFILE(fdp, uap->i)) == NULL ||
+	    (unsigned)uap->j >= p->p_rlimit[RLIMIT_OFILE].rlim_cur)
+		return (EBADF);
+	*retval = 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]);
-		if (u.u_error)
-			return;
+		return (0);
+	if ((unsigned)uap->j >= fdp->fd_nfiles) {
+		if (error = fdalloc(p, uap->j, &i))
+			return (error);
+		if (uap->j != i)
+			panic("dup2: fdalloc");
+	} else if (OFILE(fdp, uap->j)) {
+		if (OFILEFLAGS(fdp, uap->j) & UF_MAPPED)
+			(void) munmapfd(p, uap->j);
+		error = closef(OFILE(fdp, uap->j), p);
 	}
-	dupit(uap->j, fp, u.u_pofile[uap->i] &~ UF_EXCLOSE);
-}
-
-dupit(fd, fp, flags)
-	int fd;
-	register struct file *fp;
-	register int flags;
-{
-
-	u.u_ofile[fd] = fp;
-	u.u_pofile[fd] = flags;
+	OFILE(fdp, uap->j) = fp;
+	OFILEFLAGS(fdp, uap->j) = OFILEFLAGS(fdp, uap->i) &~ UF_EXCLOSE;
 	fp->f_count++;
+	if (uap->j > fdp->fd_lastfile)
+		fdp->fd_lastfile = uap->j;
+	/*
+	 * dup2() must succeed even though the close had an error.
+	 */
+	error = 0;		/* XXX */
+	return (error);
 }
 
 /*
  * The file control system call.
  */
-fcntl()
-{
-	register struct file *fp;
-	register struct a {
-		int	fdes;
+/* ARGSUSED */
+fcntl(p, uap, retval)
+	struct proc *p;
+	register struct args {
+		int	fd;
 		int	cmd;
 		int	arg;
 	} *uap;
-	register i;
+	int *retval;
+{
+	register struct filedesc *fdp = p->p_fd;
+	register struct file *fp;
 	register char *pop;
-
-	uap = (struct a *)u.u_ap;
-	GETF(fp, uap->fdes);
-	pop = &u.u_pofile[uap->fdes];
+	struct vnode *vp;
+	int i, error, flags = F_POSIX;
+	struct flock fl;
+
+	if ((unsigned)uap->fd >= fdp->fd_nfiles ||
+	    (fp = OFILE(fdp, uap->fd)) == NULL)
+		return (EBADF);
+	pop = &OFILEFLAGS(fdp, uap->fd);
 	switch(uap->cmd) {
 	case F_DUPFD:
-		i = uap->arg;
-		if (i < 0 || i >= NOFILE) {
-			u.u_error = EINVAL;
-			return;
-		}
-		if ((i = ufalloc(i)) < 0)
-			return;
-		dupit(i, fp, *pop &~ UF_EXCLOSE);
-		break;
+		if ((unsigned)uap->arg >= p->p_rlimit[RLIMIT_OFILE].rlim_cur)
+			return (EINVAL);
+		if (error = fdalloc(p, uap->arg, &i))
+			return (error);
+		OFILE(fdp, i) = fp;
+		OFILEFLAGS(fdp, i) = *pop &~ UF_EXCLOSE;
+		fp->f_count++;
+		if (i > fdp->fd_lastfile)
+			fdp->fd_lastfile = i;
+		*retval = i;
+		return (0);
 
 	case F_GETFD:
-		u.u_r.r_val1 = *pop & 1;
-		break;
+		*retval = *pop & 1;
+		return (0);
 
 	case F_SETFD:
 		*pop = (*pop &~ 1) | (uap->arg & 1);
-		break;
+		return (0);
 
 	case F_GETFL:
-		u.u_r.r_val1 = fp->f_flag+FOPEN;
-		break;
+		*retval = OFLAGS(fp->f_flag);
+		return (0);
 
 	case F_SETFL:
-		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)
+		fp->f_flag &= ~FCNTLFLAGS;
+		fp->f_flag |= FFLAGS(uap->arg) & FCNTLFLAGS;
+		if (error = fset(fp, FNDELAY, fp->f_flag & FNDELAY))
+			return (error);
+		if (error = fset(fp, FASYNC, fp->f_flag & FASYNC))
 			(void) fset(fp, FNDELAY, 0);
-		break;
+		return (error);
 
 	case F_GETOWN:
-		u.u_error = fgetown(fp, &u.u_r.r_val1);
-		break;
+		return (fgetown(fp, retval));
 
 	case F_SETOWN:
-		u.u_error = fsetown(fp, uap->arg);
-		break;
+		return (fsetown(fp, uap->arg));
+
+	case F_SETLKW:
+		flags |= 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);
+			return (VOP_ADVLOCK(vp, p, F_SETLK, &fl, flags));
+
+		case F_WRLCK:
+			if ((fp->f_flag & FWRITE) == 0)
+				return (EBADF);
+			return (VOP_ADVLOCK(vp, p, F_SETLK, &fl, flags));
+
+		case F_UNLCK:
+			return (VOP_ADVLOCK(vp, 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, 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)
@@ -185,7 +260,7 @@ fgetown(fp, valuep)
 	switch (fp->f_type) {
 
 	case DTYPE_SOCKET:
-		*valuep = ((struct socket *)fp->f_data)->so_pgrp;
+		*valuep = ((struct socket *)fp->f_data)->so_pgid;
 		return (0);
 
 	default:
@@ -201,14 +276,14 @@ fsetown(fp, value)
 {
 
 	if (fp->f_type == DTYPE_SOCKET) {
-		((struct socket *)fp->f_data)->so_pgrp = value;
+		((struct socket *)fp->f_data)->so_pgid = value;
 		return (0);
 	}
 	if (value > 0) {
 		struct proc *p = pfind(value);
 		if (p == 0)
-			return (EINVAL);
-		value = p->p_pgrp;
+			return (ESRCH);
+		value = p->p_pgrp->pg_id;
 	} else
 		value = -value;
 	return (fioctl(fp, (int)TIOCSPGRP, (caddr_t)&value));
@@ -223,97 +298,178 @@ fioctl(fp, cmd, value)
 	return ((*fp->f_ops->fo_ioctl)(fp, cmd, value));
 }
 
-close()
+/*
+ * Close a file descriptor.
+ */
+/* ARGSUSED */
+close(p, uap, retval)
+	struct proc *p;
+	struct args {
+		int	fd;
+	} *uap;
+	int *retval;
 {
-	register struct a {
-		int	i;
-	} *uap = (struct a *)u.u_ap;
+	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
+	register int fd = uap->fd;
 	register u_char *pf;
 
-	GETF(fp, uap->i);
-	pf = (u_char *)&u.u_pofile[uap->i];
+	if ((unsigned)fd >= fdp->fd_nfiles ||
+	    (fp = OFILE(fdp, fd)) == NULL)
+		return (EBADF);
+	pf = (u_char *)&OFILEFLAGS(fdp, fd);
 	if (*pf & UF_MAPPED)
-		munmapfd(uap->i);
-	u.u_ofile[uap->i] = NULL;
+		(void) munmapfd(p, fd);
+	OFILE(fdp, fd) = NULL;
+	while (fdp->fd_lastfile >= 0 && OFILE(fdp, fdp->fd_lastfile) == NULL)
+		fdp->fd_lastfile--;
+	if (fd < fdp->fd_freefile)
+		fdp->fd_freefile = fd;
 	*pf = 0;
-	closef(fp);
-	/* WHAT IF u.u_error ? */
+	return (closef(fp, p));
 }
 
-fstat()
-{
-	register struct file *fp;
-	register struct a {
-		int	fdes;
+/*
+ * Return status information about a file descriptor.
+ */
+/* ARGSUSED */
+fstat(p, uap, retval)
+	struct proc *p;
+	register struct args {
+		int	fd;
 		struct	stat *sb;
 	} *uap;
+	int *retval;
+{
+	register struct filedesc *fdp = p->p_fd;
+	register struct file *fp;
 	struct stat ub;
+	int error;
 
-	uap = (struct a *)u.u_ap;
-	GETF(fp, uap->fdes);
+	if ((unsigned)uap->fd >= fdp->fd_nfiles ||
+	    (fp = OFILE(fdp, uap->fd)) == NULL)
+		return (EBADF);
 	switch (fp->f_type) {
 
-	case DTYPE_INODE:
-		u.u_error = ino_stat((struct inode *)fp->f_data, &ub);
+	case DTYPE_VNODE:
+		error = vn_stat((struct vnode *)fp->f_data, &ub);
 		break;
 
 	case DTYPE_SOCKET:
-		u.u_error = soo_stat((struct socket *)fp->f_data, &ub);
+		error = soo_stat((struct socket *)fp->f_data, &ub);
 		break;
 
 	default:
 		panic("fstat");
 		/*NOTREACHED*/
 	}
-	if (u.u_error == 0)
-		u.u_error = copyout((caddr_t)&ub, (caddr_t)uap->sb,
-		    sizeof (ub));
+	if (error == 0)
+		error = copyout((caddr_t)&ub, (caddr_t)uap->sb, sizeof (ub));
+	return (error);
 }
 
 /*
- * Allocate a user file descriptor.
+ * Allocate a file descriptor for the process.
  */
-ufalloc(i)
-	register int i;
-{
+int fdexpand;
 
-	for (; i < NOFILE; i++)
-		if (u.u_ofile[i] == NULL) {
-			u.u_r.r_val1 = i;
-			u.u_pofile[i] = 0;
-			return (i);
+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 (OFILE(fdp, i) == NULL) {
+				OFILEFLAGS(fdp, i) = 0;
+				if (i > fdp->fd_lastfile)
+					fdp->fd_lastfile = i;
+				if (fdp->fd_freefile <= want)
+					fdp->fd_freefile = i;
+				*result = i;
+				return (0);
+			}
 		}
-	u.u_error = EMFILE;
-	return (-1);
+
+		/*
+		 * No space in current array.  Expand?
+		 */
+		if (fdp->fd_nfiles >= lim)
+			return (EMFILE);
+		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);
+		FREE(fdp->fd_ofiles, M_FILEDESC);
+		fdp->fd_ofiles = newofile;
+		fdp->fd_ofileflags = newofileflags;
+		fdp->fd_nfiles = nfiles;
+		fdexpand++;
+	}
 }
 
-ufavail()
+/*
+ * Check to see whether n user file descriptors are available.
+ */
+fdavail(p, n)
+	struct proc *p;
+	register int n;
 {
-	register int i, avail = 0;
+	register struct filedesc *fdp = p->p_fd;
+	register int i;
 
-	for (i = 0; i < NOFILE; i++)
-		if (u.u_ofile[i] == NULL)
-			avail++;
-	return (avail);
+	if ((i = p->p_rlimit[RLIMIT_OFILE].rlim_cur - fdp->fd_nfiles) > 0 &&
+	    (n -= i) <= 0)
+		return (1);
+	for (i = fdp->fd_freefile; i < fdp->fd_nfiles; i++)
+		if (OFILE(fdp, i) == NULL && --n <= 0)
+			return (1);
+	for (i = 0; i < fdp->fd_freefile; i++)
+		if (OFILE(fdp, i) == NULL && --n <= 0)
+			return (1);
+	return (0);
 }
 
 struct	file *lastf;
 /*
- * Allocate a user file descriptor
- * and a file structure.
- * Initialize the descriptor
- * to point at the file structure.
+ * Create a new open file structure and allocate
+ * a file decriptor for the process that refers to it.
  */
-struct file *
-falloc()
+falloc(p, resultfp, resultfd)
+	register struct proc *p;
+	struct file **resultfp;
+	int *resultfd;
 {
 	register struct file *fp;
-	register i;
+	int error, i;
 
-	i = ufalloc(0);
-	if (i < 0)
-		return (NULL);
+	if (error = fdalloc(p, 0, &i))
+		return (error);
 	if (lastf == 0)
 		lastf = file;
 	for (fp = lastf; fp < fileNFILE; fp++)
@@ -323,84 +479,228 @@ falloc()
 		if (fp->f_count == 0)
 			goto slot;
 	tablefull("file");
-	u.u_error = ENFILE;
-	return (NULL);
+	return (ENFILE);
 slot:
-	u.u_ofile[i] = fp;
+	OFILE(p->p_fd, i) = fp;
 	fp->f_count = 1;
 	fp->f_data = 0;
 	fp->f_offset = 0;
+	fp->f_cred = p->p_ucred;
+	crhold(fp->f_cred);
 	lastf = fp + 1;
-	return (fp);
+	if (resultfp)
+		*resultfp = fp;
+	if (resultfd)
+		*resultfd = i;
+	return (0);
 }
 
 /*
- * 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.
+ * Copy a filedesc structure.
  */
-struct file *
-getf(f)
-	register int f;
+struct filedesc *
+fdcopy(p)
+	struct proc *p;
 {
+	register struct filedesc *fdp = p->p_fd;
+	register struct filedesc *newfdp;
 	register struct file *fp;
+	register int i;
 
-	if ((unsigned)f >= NOFILE || (fp = u.u_ofile[f]) == NULL) {
-		u.u_error = EBADF;
-		return (NULL);
-	}
-	return (fp);
+	MALLOC(newfdp, struct filedesc *, sizeof(*fdp), M_FILEDESC, M_WAITOK);
+	bcopy(fdp, newfdp, sizeof(*fdp));
+	VREF(newfdp->fd_cdir);
+	if (newfdp->fd_rdir)
+		VREF(newfdp->fd_rdir);
+	newfdp->fd_refcnt = 1;
+
+	/*
+	 * Compute the smallest multiple of NOEXTENT needed
+	 * for the file descriptors currently in use,
+	 * allowing the table to shrink.
+	 */
+	i = newfdp->fd_nfiles;
+	while (i > NOEXTENT * 2 && i >= (fdp->fd_lastfile + 1) / 2)
+		i /= 2;
+	newfdp->fd_nfiles = i;
+	MALLOC(newfdp->fd_ofiles, struct file **, i * OFILESIZE,
+	    M_FILEDESC, M_WAITOK);
+	newfdp->fd_ofileflags = (char *) &newfdp->fd_ofiles[i];
+	bcopy(fdp->fd_ofiles, newfdp->fd_ofiles, i * sizeof(struct file **));
+	bcopy(fdp->fd_ofileflags, newfdp->fd_ofileflags, i * sizeof(char));
+	for (i = 0; i <= newfdp->fd_lastfile; i++)
+		if (fp = OFILE(newfdp, i))
+			fp->f_count++;
+	return (newfdp);
+}
+
+/*
+ * Release a filedesc structure.
+ */
+fdfree(p)
+	struct proc *p;
+{
+	register struct filedesc *fdp = p->p_fd;
+	struct file *fp;
+	register int i;
+
+	if (--fdp->fd_refcnt > 0)
+		return;
+	for (i = 0; i <= fdp->fd_lastfile; i++)
+		if (fp = OFILE(fdp, i))
+			(void) closef(fp, p);
+	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.
  */
-closef(fp)
+closef(fp, p)
 	register struct file *fp;
+	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 (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, p, F_UNLCK, &lf, F_POSIX);
 	}
-	(*fp->f_ops->fo_close)(fp);
+	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;
+	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).
  */
-flock()
-{
-	register struct a {
+
+/* ARGSUSED */
+flock(p, uap, retval)
+	struct proc *p;
+	register struct args {
 		int	fd;
 		int	how;
-	} *uap = (struct a *)u.u_ap;
+	} *uap;
+	int *retval;
+{
+	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
+	struct vnode *vp;
+	struct flock lf;
+	int error;
 
-	GETF(fp, uap->fd);
-	if (fp->f_type != DTYPE_INODE) {
-		u.u_error = EOPNOTSUPP;
-		return;
-	}
+	if ((unsigned)uap->fd >= fdp->fd_nfiles ||
+	    (fp = OFILE(fdp, 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) {
-		ino_unlock(fp, FSHLOCK|FEXLOCK);
-		return;
+		lf.l_type = F_UNLCK;
+		return (VOP_ADVLOCK(vp, fp, F_UNLCK, &lf, F_FLOCK));
 	}
-	if ((uap->how & (LOCK_SH | LOCK_EX)) == 0)
-		return;					/* error? */
-	/* avoid work... */
-	if ((fp->f_flag & FEXLOCK) && (uap->how & LOCK_EX))
-		return;
-	u.u_error = ino_lock(fp, uap->how);
+	if (uap->how & LOCK_EX)
+		lf.l_type = F_WRLCK;
+	else if (uap->how & LOCK_SH)
+		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));
+}
+
+/*
+ * 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)
+	dev_t dev;
+	int mode, type;
+{
+
+	/*
+	 * 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.
+	 */
+	curproc->p_dupfd = minor(dev);		/* XXX */
+	return (ENODEV);
+}
+
+/*
+ * Duplicate the specified descriptor to a free descriptor.
+ */
+dupfdopen(fdp, indx, dfd, mode)
+	register struct filedesc *fdp;
+	register int indx, dfd;
+	int mode;
+{
+	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 = OFILE(fdp, indx);
+	if ((u_int)dfd >= fdp->fd_nfiles || (wfp = OFILE(fdp, dfd)) == NULL ||
+	    fp == wfp)
+		return (EBADF);
+
+	/*
+	 * 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);
+	OFILE(fdp, indx) = wfp;
+	OFILEFLAGS(fdp, indx) = OFILEFLAGS(fdp, dfd);
+	wfp->f_count++;
+	if (indx > fdp->fd_lastfile)
+		fdp->fd_lastfile = indx;
+	return (0);
 }