summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-08 13:04:58 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-08 13:04:58 +0000
commitb09b5a31990e6b8ae071281dcba5381aa38d9753 (patch)
tree8c2e5ceeb3897f554192877c80714c586550589f /sys
parent2cd07d8b2eac18717b0d90cec851a8bc329ab490 (diff)
svr4 should support the svr3 style fcntl-cmd name F_GETLK_SVR3
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/ibcs2/files.ibcs24
-rw-r--r--sys/compat/svr4/svr4_fcntl.c9
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/compat/ibcs2/files.ibcs2 b/sys/compat/ibcs2/files.ibcs2
index d4f7c73a36b..5e505e5b160 100644
--- a/sys/compat/ibcs2/files.ibcs2
+++ b/sys/compat/ibcs2/files.ibcs2
@@ -1,4 +1,4 @@
-# $OpenBSD: files.ibcs2,v 1.2 1996/08/02 20:35:02 niklas Exp $
+# $OpenBSD: files.ibcs2,v 1.3 1997/01/08 13:04:53 niklas Exp $
# $NetBSD: files.ibcs2,v 1.3 1995/08/14 01:34:09 mycroft Exp $
#
# Config.new file description for machine-independent IBCS-2 compat code.
@@ -9,7 +9,7 @@
file compat/ibcs2/ibcs2_errno.c compat_ibcs2
file compat/ibcs2/ibcs2_exec.c compat_ibcs2
-file compat/ibcs2/ibcs2_fcntl.c compat_ibcs2
+file compat/ibcs2/ibcs2_fcntl.c compat_ibcs2 | compat_svr4
file compat/ibcs2/ibcs2_ioctl.c compat_ibcs2
file compat/ibcs2/ibcs2_ipc.c compat_ibcs2
file compat/ibcs2/ibcs2_misc.c compat_ibcs2
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 7c97627786e..45436c42c74 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_fcntl.c,v 1.3 1996/08/02 20:20:32 niklas Exp $ */
+/* $OpenBSD: svr4_fcntl.c,v 1.4 1997/01/08 13:04:57 niklas Exp $ */
/* $NetBSD: svr4_fcntl.c,v 1.14 1995/10/14 20:24:24 christos Exp $ */
/*
@@ -48,6 +48,10 @@
#include <compat/svr4/svr4_util.h>
#include <compat/svr4/svr4_fcntl.h>
+#include <compat/ibcs2/ibcs2_types.h>
+#include <compat/ibcs2/ibcs2_signal.h>
+#include <compat/ibcs2/ibcs2_syscallargs.h>
+
static u_long svr4_to_bsd_cmd __P((u_long));
static int svr4_to_bsd_flags __P((int));
static int bsd_to_svr4_flags __P((int));
@@ -262,6 +266,9 @@ svr4_sys_fcntl(p, v, retval)
int error;
struct sys_fcntl_args fa;
+ if (SCARG(uap, cmd) == SVR4_F_GETLK_SVR3)
+ return ibcs2_sys_fcntl(p, v, retval);
+
SCARG(&fa, fd) = SCARG(uap, fd);
SCARG(&fa, cmd) = svr4_to_bsd_cmd(SCARG(uap, cmd));