Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/sys Add a userland stub to do the union semun -> un...



details:   https://anonhg.NetBSD.org/src/rev/f97935c64f75
branches:  trunk
changeset: 481455:f97935c64f75
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 31 15:14:19 2000 +0000

description:
Add a userland stub to do the union semun -> union semun * redirection.

diffstat:

 lib/libc/sys/Makefile.inc |   9 +++-
 lib/libc/sys/__semctl13.c |  87 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)

diffs (121 lines):

diff -r c786f2bf9e3b -r f97935c64f75 lib/libc/sys/Makefile.inc
--- a/lib/libc/sys/Makefile.inc Mon Jan 31 15:13:24 2000 +0000
+++ b/lib/libc/sys/Makefile.inc Mon Jan 31 15:14:19 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.97 1999/10/27 14:58:28 is Exp $
+#      $NetBSD: Makefile.inc,v 1.98 2000/01/31 15:14:19 christos Exp $
 #      @(#)Makefile.inc        8.3 (Berkeley) 10/24/94
 
 # sys sources
@@ -23,6 +23,11 @@
        pread.c preadv.c pwrite.c pwritev.c semctl.c \
        sigaltstack.c stat.c swapon.c truncate.c
 
+# glue to syscalls that may pass structs or unions, which cannot be
+# handled portably and easily by the syscall interface. The glue
+# converts structs and unions to pointers to them.
+SRCS+= __semctl13.c
+
 # "stub" POSIX.1b interfaces which return -1 and set errno to ENOSYS, so
 # we can avoid bumping libc's minor number as functions are added to the
 # kernel.
@@ -49,7 +54,7 @@
        nfssvc.o ntp_adjtime.o ntp_gettime.o open.o pathconf.o \
        poll.o profil.o quotactl.o read.o \
        readlink.o readv.o reboot.o recvfrom.o recvmsg.o rename.o revoke.o \
-       rmdir.o select.o semconfig.o semget.o semop.o __semctl13.o sendmsg.o \
+       rmdir.o select.o semconfig.o semget.o semop.o ____semctl13.o sendmsg.o \
        sendto.o setegid.o seteuid.o setgid.o setgroups.o setitimer.o \
        setpgid.o setpriority.o setregid.o setreuid.o setrlimit.o \
        setsid.o setsockopt.o settimeofday.o setuid.o shmat.o \
diff -r c786f2bf9e3b -r f97935c64f75 lib/libc/sys/__semctl13.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libc/sys/__semctl13.c Mon Jan 31 15:14:19 2000 +0000
@@ -0,0 +1,87 @@
+/*     $NetBSD: __semctl13.c,v 1.1 2000/01/31 15:14:19 christos Exp $  */
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: __semctl13.c,v 1.1 2000/01/31 15:14:19 christos Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+
+/* The kernel version [... == union semun *] */
+int ____semctl13 __P((int, int, int, ...));
+/* The userland version [... == union semun] */
+int __semctl13 __P((int, int, int, ...));
+
+#if __STDC__
+int __semctl13(int semid, int semnum, int cmd, ...)
+#else
+int __semctl13(va_alist)
+       va_dcl
+#endif
+{
+       va_list ap;
+       union __semun semun;
+#if __STDC__
+       va_start(ap, cmd);
+#else
+       int semid, semnum;
+       int cmd;
+       va_start(ap);
+       semid = va_arg(ap, int);
+       semnum = va_arg(ap, int);
+       cmd = va_arg(ap, int);
+#endif
+       switch (cmd) {
+       case IPC_SET:
+       case IPC_STAT:
+       case GETALL:
+       case SETVAL:
+       case SETALL:
+           semun = va_arg(ap, union __semun);
+       }
+       va_end(ap);
+       return ____semctl13(semid, semnum, cmd, &semun);
+}



Home | Main Index | Thread Index | Old Index