summaryrefslogtreecommitdiff
path: root/sys/compat/svr4/svr4_filio.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/compat/svr4/svr4_filio.c')
-rw-r--r--sys/compat/svr4/svr4_filio.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index f7a5062922a..47e4902541c 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -1,4 +1,5 @@
-/* $NetBSD: svr4_filio.c,v 1.4 1996/03/30 22:37:52 christos Exp $ */
+/* $OpenBSD: svr4_filio.c,v 1.3 1996/04/21 22:18:19 deraadt Exp $ */
+/* $NetBSD: svr4_filio.c,v 1.5 1996/04/11 12:54:40 christos Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -53,17 +54,17 @@
int
-svr4_filioctl(fp, cmd, data, p, retval)
+svr4_fil_ioctl(fp, p, retval, fd, cmd, data)
struct file *fp;
- u_long cmd;
- caddr_t data;
struct proc *p;
register_t *retval;
+ int fd;
+ u_long cmd;
+ caddr_t data;
{
- struct filedesc *fdp = p->p_fd;
int error;
- int fd;
int num;
+ struct filedesc *fdp = p->p_fd;
int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) =
fp->f_ops->fo_ioctl;
@@ -71,12 +72,10 @@ svr4_filioctl(fp, cmd, data, p, retval)
switch (cmd) {
case SVR4_FIOCLEX:
- fd = fp - fdp->fd_ofiles[0];
fdp->fd_ofileflags[fd] |= UF_EXCLOSE;
return 0;
case SVR4_FIONCLEX:
- fd = fp - fdp->fd_ofiles[0];
fdp->fd_ofileflags[fd] &= ~UF_EXCLOSE;
return 0;