summaryrefslogtreecommitdiff
path: root/lib/libc/sys
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1995-02-27 11:22:54 +0000
committercgd <cgd@NetBSD.org>1995-02-27 11:22:54 +0000
commitc67e54a2e2b9f3d455a30d68ea4e09e56d7b9136 (patch)
treef79355486cc43541b979bfc40a6cdc362bbb52a7 /lib/libc/sys
parentaeb457b1a7d14abd80b8ea89c3f4a57103788f63 (diff)
clean up merge, fix Id's
Diffstat (limited to 'lib/libc/sys')
-rw-r--r--lib/libc/sys/Makefile.inc70
-rw-r--r--lib/libc/sys/ftruncate.c9
-rw-r--r--lib/libc/sys/lseek.c9
-rw-r--r--lib/libc/sys/mmap.c9
-rw-r--r--lib/libc/sys/semctl.c35
-rw-r--r--lib/libc/sys/truncate.c9
6 files changed, 96 insertions, 45 deletions
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index abb41382515..de625c8705a 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
-# from: @(#)Makefile.inc 5.11 (Berkeley) 6/23/91
-# $Id: Makefile.inc,v 1.31 1994/12/28 01:42:56 mycroft Exp $
+# $NetBSD: Makefile.inc,v 1.32 1995/02/27 11:22:54 cgd Exp $
+# @(#)Makefile.inc 8.1 (Berkeley) 6/17/93
# sys sources
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -9,7 +9,9 @@ SRCS+= Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S reboot.S \
sbrk.S setlogin.S sigpending.S sigprocmask.S sigreturn.S \
sigsuspend.S syscall.S
-SRCS+= ftruncate.c lseek.c mmap.c semctl.c truncate.c
+# glue to provide compatibility between GCC 1.X and 2.X and for compat
+# with old syscall interfaces.
+SRCS+= ftruncate.c lseek.c mmap.c semctl.c truncate.c
# modules with default implementations on all architectures:
ASM= accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \
@@ -17,21 +19,20 @@ ASM= accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \
fchflags.o fchmod.o fchown.o fcntl.o flock.o fpathconf.o fstat.o \
fstatfs.o fsync.o getdirentries.o getegid.o geteuid.o getfh.o \
getfsstat.o getgid.o getgroups.o getitimer.o getpeername.o getpgrp.o \
- getpid.o getppid.o getpriority.o getrlimit.o getrusage.o \
- getsockname.o getsockopt.o gettimeofday.o getuid.o ioctl.o kill.o \
- ktrace.o lfs_bmapv.o lfs_markv.o lfs_segclean.o lfs_segwait.o link.o \
- listen.o lstat.o madvise.o mincore.o mkdir.o mkfifo.o mknod.o \
- mlock.o mount.o mprotect.o msgctl.o msgget.o msgrcv.o msgsnd.o \
- msync.o munlock.o munmap.o nfssvc.o open.o pathconf.o profil.o \
- quotactl.o read.o readlink.o readv.o recvfrom.o recvmsg.o rename.o \
- revoke.o rmdir.o select.o semconfig.o semget.o semop.o sendmsg.o \
- sendto.o setegid.o seteuid.o setgid.o setgroups.o setitimer.o \
- setpgid.o setpriority.o setrlimit.o setsid.o setsockopt.o \
- settimeofday.o setuid.o shmat.o shmctl.o shmdt.o shmget.o shutdown.o \
- sigaction.o sigaltstack.o socket.o socketpair.o stat.o statfs.o \
- swapon.o symlink.o sync.o sysarch.o umask.o undelete.o unlink.o \
- unmount.o utimes.o vadvise.o wait4.o write.o writev.o __semctl.o \
- __syscall.o __sysctl.o
+ getpid.o getppid.o getpriority.o getrlimit.o getrusage.o getsockname.o \
+ getsockopt.o gettimeofday.o getuid.o ioctl.o kill.o ktrace.o lfs_bmapv.o \
+ lfs_markv.o lfs_segclean.o lfs_segwait.o link.o listen.o lstat.o \
+ madvise.o mincore.o mkdir.o mkfifo.o mknod.o mlock.o mount.o \
+ mprotect.o msgctl.o msgget.o msgrcv.o msgsend.o msync.o munlock.o \
+ munmap.o nfssvc.o open.o pathconf.o profil.o quotactl.o read.o \
+ readlink.o readv.o recvfrom.o recvmsg.o rename.o revoke.o rmdir.o \
+ select.o semconfig.o semget.o semop.o sendmsg.o sendto.o setegid.o \
+ seteuid.o setgid.o setgroups.o setitimer.o setpgid.o setpriority.o \
+ setrlimit.o setsid.o setsockopt.o settimeofday.o setuid.o shmat.o \
+ shmctl.o shmdt.o shmget.o shutdown.o sigaction.o sigaltstack.o socket.o \
+ socketpair.o stat.o statfs.o swapon.o symlink.o sync.o sysarch.o umask.o \
+ undelete.o unlink.o unmount.o utimes.o vadvise.o wait4.o write.o writev.o \
+ __semctl.o __syscall.o __sysctl.o
PASM= ${ASM:.o=.po}
SASM= ${ASM:.o=.so}
@@ -80,24 +81,20 @@ ${PSEUDO}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
@${LD} -x -r ${.TARGET}
@mv a.out ${.TARGET}
-MAN+= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 \
- chdir.2 chflags.2 chmod.2 chown.2 chroot.2 close.2 connect.2 \
- dup.2 execve.2 _exit.2 fcntl.2 flock.2 fork.2 fsync.2 \
- getdirentries.2 getfh.2 getfsstat.2 \
- getgid.2 getgroups.2 getitimer.2 getlogin.2 \
- getpeername.2 getpgrp.2 getpid.2 getpriority.2 \
- getrlimit.2 getrusage.2 getsockname.2 getsockopt.2 \
- gettimeofday.2 getuid.2 intro.2 ioctl.2 kill.2 link.2 listen.2 \
- lseek.2 mkdir.2 mkfifo.2 mknod.2 madvise.2 mincore.2 mlock.2 \
- mmap.2 mount.2 \
- mprotect.2 msync.2 munmap.2 nfssvc.2 open.2 pathconf.2 pipe.2 \
- ptrace.2 quotactl.2 read.2 readlink.2 reboot.2 recv.2 rename.2 \
- revoke.2 rmdir.2 select.2 send.2 setgroups.2 setpgid.2 setsid.2 \
- setuid.2 shutdown.2 sigaction.2 sigaltstack.2 sigprocmask.2 \
- sigreturn.2 \
- sigsuspend.2 socket.2 socketpair.2 stat.2 statfs.2 swapon.2 \
- symlink.2 sync.2 sysarch.2 syscall.2 truncate.2 umask.2 \
- unlink.2 utimes.2 vfork.2 wait.2 write.2
+MAN+= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chflags.2 \
+ chmod.2 chown.2 chroot.2 close.2 connect.2 dup.2 execve.2 _exit.2 \
+ fcntl.2 flock.2 fork.2 fsync.2 getdirentries.2 getfh.2 getfsstat.2 \
+ getgid.2 getgroups.2 getitimer.2 getlogin.2 getpeername.2 getpgrp.2 \
+ getpid.2 getpriority.2 getrlimit.2 getrusage.2 getsockname.2 \
+ getsockopt.2 gettimeofday.2 getuid.2 intro.2 ioctl.2 kill.2 link.2 \
+ listen.2 lseek.2 mkdir.2 mkfifo.2 mknod.2 madvise.2 mincore.2 mlock.2 \
+ mmap.2 mount.2 mprotect.2 msync.2 munmap.2 nfssvc.2 open.2 pathconf.2 \
+ pipe.2 profil.2 ptrace.2 quotactl.2 read.2 readlink.2 reboot.2 recv.2 \
+ rename.2 revoke.2 rmdir.2 select.2 send.2 setgroups.2 setpgid.2 \
+ setsid.2 setuid.2 shutdown.2 sigaction.2 sigaltstack.2 sigpending.2 \
+ sigprocmask.2 sigreturn.2 sigstack.2 sigsuspend.2 socket.2 \
+ socketpair.2 stat.2 statfs.2 swapon.2 symlink.2 sync.2 sysarch.2 \
+ syscall.2 truncate.2 umask.2 unlink.2 utimes.2 vfork.2 wait.2 write.2
MLINKS+=brk.2 sbrk.2
MLINKS+=dup.2 dup2.2
@@ -126,6 +123,7 @@ MLINKS+=setpgid.2 setpgrp.2
MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
MLINKS+=stat.2 fstat.2 stat.2 lstat.2
MLINKS+=statfs.2 fstatfs.2
+MLINKS+=syscall.2 __syscall.2
MLINKS+=truncate.2 ftruncate.2
MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
MLINKS+=write.2 writev.2
diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
index 371ab564ac6..211824ef4c9 100644
--- a/lib/libc/sys/ftruncate.c
+++ b/lib/libc/sys/ftruncate.c
@@ -1,3 +1,5 @@
+/* $NetBSD: ftruncate.c,v 1.3 1995/02/27 11:23:01 cgd Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,8 +34,11 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)ftruncate.c 8.1 (Berkeley) 6/17/93"; */
-static char *rcsid = "$Id: ftruncate.c,v 1.2 1994/05/06 01:02:52 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)ftruncate.c 8.1 (Berkeley) 6/17/93";
+#else
+static char rcsid[] = "$NetBSD: ftruncate.c,v 1.3 1995/02/27 11:23:01 cgd Exp $";
+#endif
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
index 1fece3cd238..adc75f29b2f 100644
--- a/lib/libc/sys/lseek.c
+++ b/lib/libc/sys/lseek.c
@@ -1,3 +1,5 @@
+/* $NetBSD: lseek.c,v 1.3 1995/02/27 11:23:04 cgd Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,8 +34,11 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)lseek.c 8.1 (Berkeley) 6/17/93"; */
-static char *rcsid = "$Id: lseek.c,v 1.2 1994/05/06 01:02:57 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)lseek.c 8.1 (Berkeley) 6/17/93";
+#else
+static char rcsid[] = "$NetBSD: lseek.c,v 1.3 1995/02/27 11:23:04 cgd Exp $";
+#endif
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index 352732bb4f9..442f3b1699b 100644
--- a/lib/libc/sys/mmap.c
+++ b/lib/libc/sys/mmap.c
@@ -1,3 +1,5 @@
+/* $NetBSD: mmap.c,v 1.4 1995/02/27 11:23:07 cgd Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,8 +34,11 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)mmap.c 8.1 (Berkeley) 6/17/93"; */
-static char *rcsid = "$Id: mmap.c,v 1.3 1994/10/19 03:21:41 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)mmap.c 8.1 (Berkeley) 6/17/93";
+#else
+static char rcsid[] = "$NetBSD: mmap.c,v 1.4 1995/02/27 11:23:07 cgd Exp $";
+#endif
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/sys/semctl.c b/lib/libc/sys/semctl.c
index 2317b3de016..6e3bf3ec60f 100644
--- a/lib/libc/sys/semctl.c
+++ b/lib/libc/sys/semctl.c
@@ -1,4 +1,37 @@
-/* $NetBSD: semctl.c,v 1.2 1995/02/27 10:41:36 cgd Exp $ */
+/*
+ * Copyright (c) 1994, 1995 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$NetBSD: semctl.c,v 1.3 1995/02/27 11:23:09 cgd Exp $";
+#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <sys/ipc.h>
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
index 95f88c08139..56fb0ad789d 100644
--- a/lib/libc/sys/truncate.c
+++ b/lib/libc/sys/truncate.c
@@ -1,3 +1,5 @@
+/* $NetBSD: truncate.c,v 1.3 1995/02/27 11:23:11 cgd Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,8 +34,11 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)truncate.c 8.1 (Berkeley) 6/17/93"; */
-static char *rcsid = "$Id: truncate.c,v 1.2 1994/05/06 01:02:59 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)truncate.c 8.1 (Berkeley) 6/17/93";
+#else
+static char rcsid[] = "$NetBSD: truncate.c,v 1.3 1995/02/27 11:23:11 cgd Exp $";
+#endif
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>