[src/trunk]: src/sys/compat/osf1 and the socket calls move

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4225cfac4cca
branches:  trunk
changeset: 472525:4225cfac4cca
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sat May 01 04:57:15 1999 +0000

description:
and the socket calls move

diffstat:

 sys/compat/osf1/files.osf1    |    3 +-
 sys/compat/osf1/osf1_misc.c   |   48 +----------------
 sys/compat/osf1/osf1_socket.c |  119 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+), 48 deletions(-)

diffs (201 lines):

diff -r 25f93598814a -r 4225cfac4cca sys/compat/osf1/files.osf1
--- a/sys/compat/osf1/files.osf1        Sat May 01 04:47:00 1999 +0000
+++ b/sys/compat/osf1/files.osf1        Sat May 01 04:57:15 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.osf1,v 1.7 1999/05/01 04:34:20 cgd Exp $
+#      $NetBSD: files.osf1,v 1.8 1999/05/01 04:57:15 cgd Exp $
 #
 # Config file description for machine-independent OSF/1 compat code.
 # Included by ports that need it.
@@ -17,5 +17,6 @@
 file   compat/osf1/osf1_mmap.c         compat_osf1
 file   compat/osf1/osf1_mount.c        compat_osf1
 file   compat/osf1/osf1_signal.c       compat_osf1
+file   compat/osf1/osf1_socket.c       compat_osf1
 file   compat/osf1/osf1_syscalls.c     compat_osf1
 file   compat/osf1/osf1_sysent.c       compat_osf1
diff -r 25f93598814a -r 4225cfac4cca sys/compat/osf1/osf1_misc.c
--- a/sys/compat/osf1/osf1_misc.c       Sat May 01 04:47:00 1999 +0000
+++ b/sys/compat/osf1/osf1_misc.c       Sat May 01 04:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_misc.c,v 1.40 1999/05/01 04:47:00 cgd Exp $ */
+/* $NetBSD: osf1_misc.c,v 1.41 1999/05/01 04:57:15 cgd Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -484,52 +484,6 @@
 }
 
 int
-osf1_sys_socket(p, v, retval)
-       struct proc *p;
-       void *v;
-       register_t *retval;
-{
-       struct osf1_sys_socket_args *uap = v;
-       struct sys_socket_args a;
-
-       /* XXX TRANSLATE */
-
-       if (SCARG(uap, type) > AF_LINK)
-               return (EINVAL);        /* XXX After AF_LINK, divergence. */
-
-       SCARG(&a, domain) = SCARG(uap, domain);
-       SCARG(&a, type) = SCARG(uap, type);
-       SCARG(&a, protocol) = SCARG(uap, protocol);
-
-       return sys_socket(p, &a, retval);
-}
-
-int
-osf1_sys_sendto(p, v, retval)
-       struct proc *p;
-       void *v;
-       register_t *retval;
-{
-       struct osf1_sys_sendto_args *uap = v;
-       struct sys_sendto_args a;
-       unsigned long leftovers;
-
-       SCARG(&a, s) = SCARG(uap, s);
-       SCARG(&a, buf) = SCARG(uap, buf);
-       SCARG(&a, len) = SCARG(uap, len);
-       SCARG(&a, to) = SCARG(uap, to);
-       SCARG(&a, tolen) = SCARG(uap, tolen);
-
-       /* translate flags */
-       SCARG(&a, flags) = emul_flags_translate(osf1_sendrecv_msg_flags_xtab,
-           SCARG(uap, flags), &leftovers);
-       if (leftovers != 0)
-               return (EINVAL);
-
-       return sys_sendto(p, &a, retval);
-}
-
-int
 osf1_sys_reboot(p, v, retval)
        struct proc *p;
        void *v;
diff -r 25f93598814a -r 4225cfac4cca sys/compat/osf1/osf1_socket.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/osf1/osf1_socket.c     Sat May 01 04:57:15 1999 +0000
@@ -0,0 +1,119 @@
+/* $NetBSD: osf1_socket.c,v 1.1 1999/05/01 04:57:16 cgd Exp $ */
+
+/*
+ * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
+ *
+ * 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 Christopher G. Demetriou
+ *     for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * Copyright (c) 1994, 1995 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ * 
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/mount.h>
+#include <sys/syscallargs.h>
+#include <sys/socketvar.h>
+
+#include <compat/osf1/osf1.h>
+#include <compat/osf1/osf1_syscall.h>
+#include <compat/osf1/osf1_syscallargs.h>
+#include <compat/osf1/osf1_util.h>
+#include <compat/osf1/osf1_cvt.h>
+
+int
+osf1_sys_socket(p, v, retval)
+       struct proc *p;
+       void *v;
+       register_t *retval;
+{
+       struct osf1_sys_socket_args *uap = v;
+       struct sys_socket_args a;
+
+       /* XXX TRANSLATE */
+
+       if (SCARG(uap, type) > AF_LINK)
+               return (EINVAL);        /* XXX After AF_LINK, divergence. */
+
+       SCARG(&a, domain) = SCARG(uap, domain);
+       SCARG(&a, type) = SCARG(uap, type);
+       SCARG(&a, protocol) = SCARG(uap, protocol);
+
+       return sys_socket(p, &a, retval);
+}
+
+int
+osf1_sys_sendto(p, v, retval)
+       struct proc *p;
+       void *v;
+       register_t *retval;
+{
+       struct osf1_sys_sendto_args *uap = v;
+       struct sys_sendto_args a;
+       unsigned long leftovers;
+
+       SCARG(&a, s) = SCARG(uap, s);
+       SCARG(&a, buf) = SCARG(uap, buf);
+       SCARG(&a, len) = SCARG(uap, len);
+       SCARG(&a, to) = SCARG(uap, to);
+       SCARG(&a, tolen) = SCARG(uap, tolen);
+
+       /* translate flags */
+       SCARG(&a, flags) = emul_flags_translate(osf1_sendrecv_msg_flags_xtab,
+           SCARG(uap, flags), &leftovers);
+       if (leftovers != 0)
+               return (EINVAL);
+
+       return sys_sendto(p, &a, retval);
+}