Added namespace information for future pollution-control measures.

3 files changed, 249 insertions, 245 deletions

diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index cfe962a..21e0f50 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -7,10 +7,11 @@ ARCH=	hp300 i386 luna68k news3400 pmax sparc tahoe vax
 all:
 	@echo "make tags, make links or init_sysent.c only"
 
-init_sysent.c syscalls.c ../sys/syscall.h: makesyscalls.sh syscalls.master
+init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall-hide.h: makesyscalls.sh syscalls.master
 	-mv -f init_sysent.c init_sysent.c.bak
 	-mv -f syscalls.c syscalls.c.bak
 	-mv -f ../sys/syscall.h ../sys/syscall.h.bak
+	-mv -f ../sys/syscall-hide.h ../sys/syscall-hide.h.bak
 	sh makesyscalls.sh syscalls.master
 
 # Kernel tags:
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 8a24ba3..c50ea7c 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: init_sysent.c,v 1.7 1994/09/01 05:15:33 davidg Exp $
+ * created from	$Id: syscalls.master,v 1.6 1994/09/01 05:12:42 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -524,4 +524,4 @@ struct sysentvec aout_sysvec = {
 	0,
 	0,
 	0
-};
+};
\ No newline at end of file
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index fc579e8..8c67063 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,13 +1,14 @@
-	$Id: syscalls.master,v 1.5 1994/08/26 18:15:15 wollman Exp $
+	$Id: syscalls.master,v 1.6 1994/09/01 05:12:42 davidg Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
 ; Processed to created init_sysent.c, syscalls.c and syscall.h.
 
-; Columns: number type nargs name altname/comments
+; Columns: number type nargs namespc name altname/comments
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, COMPAT
 ;	nargs	number of arguments
+;	namespc one of POSIX, BSD, NOHIDE
 ;	name	name of syscall routine
 ;	altname	name of system call if different
 ;		for UNIMPL/OBSOL, name continues with comments
@@ -27,278 +28,280 @@
 ; redistributions should be placed in the reserved range at the end
 ; of the current calls.
 
-0	STD	0 nosys syscall
-1	STD	1 exit
-2	STD	0 fork
-3	STD	3 read
-4	STD	3 write
-5	STD	3 open
-6	STD	1 close
-7	STD	4 wait4
-8	COMPAT	2 creat
-9	STD	2 link
-10	STD	1 unlink
-11	OBSOL	2 execv
-12	STD	1 chdir
-13	STD	1 fchdir
-14	STD	3 mknod
-15	STD	2 chmod
-16	STD	3 chown
-17	STD	1 obreak break
-18	STD	3 getfsstat
-19	COMPAT	3 lseek
-20	STD	0 getpid
-21	STD	4 mount
-22	STD	2 unmount
-23	STD	1 setuid
-24	STD	0 getuid
-25	STD	0 geteuid
-26	STD	4 ptrace
-27	STD	3 recvmsg
-28	STD	3 sendmsg
-29	STD	6 recvfrom
-30	STD	3 accept
-31	STD	3 getpeername
-32	STD	3 getsockname
-33	STD	2 access
-34	STD	2 chflags
-35	STD	2 fchflags
-36	STD	0 sync
-37	STD	2 kill
-38	COMPAT	2 stat
-39	STD	0 getppid
-40	COMPAT	2 lstat
-41	STD	2 dup
-42	STD	0 pipe
-43	STD	0 getegid
-44	STD	4 profil
+0	STD	0 NOHIDE	nosys syscall
+1	STD	1 NOHIDE	exit
+2	STD	0 POSIX	fork
+3	STD	3 POSIX	read
+4	STD	3 POSIX	write
+5	STD	3 POSIX	open
+6	STD	1 POSIX	close
+7	STD	4 BSD	wait4
+8	COMPAT	2 BSD	creat
+9	STD	2 POSIX	link
+10	STD	1 POSIX	unlink
+11	OBSOL	2 NOHIDE execv
+12	STD	1 POSIX	chdir
+13	STD	1 BSD	fchdir
+14	STD	3 POSIX	mknod
+15	STD	2 POSIX	chmod
+16	STD	3 POSIX	chown
+17	STD	1 BSD	obreak break
+18	STD	3 BSD	getfsstat
+19	COMPAT	3 POSIX	lseek
+20	STD	0 POSIX	getpid
+21	STD	4 BSD	mount
+22	STD	2 BSD	unmount
+23	STD	1 POSIX	setuid
+24	STD	0 POSIX	getuid
+25	STD	0 POSIX	geteuid
+26	STD	4 BSD	ptrace
+27	STD	3 BSD	recvmsg
+28	STD	3 BSD	sendmsg
+29	STD	6 BSD	recvfrom
+30	STD	3 BSD	accept
+31	STD	3 BSD	getpeername
+32	STD	3 BSD	getsockname
+33	STD	2 POSIX	access
+34	STD	2 BSD	chflags
+35	STD	2 BSD	fchflags
+36	STD	0 BSD	sync
+37	STD	2 POSIX	kill
+38	COMPAT	2 POSIX	stat
+39	STD	0 POSIX	getppid
+40	COMPAT	2 POSIX	lstat
+41	STD	2 POSIX	dup
+42	STD	0 POSIX	pipe
+43	STD	0 POSIX	getegid
+44	STD	4 BSD	profil
 #ifdef KTRACE
-45	STD	4 ktrace
+45	STD	4 BSD	ktrace
 #else
-45	UNIMPL	0 ktrace
+45	UNIMPL	0 BSD	ktrace
 #endif
-46	STD	3 sigaction
-47	STD	0 getgid
-48	STD	2 sigprocmask
-49	STD	2 getlogin
-50	STD	1 setlogin
-51	STD	1 acct
-52	STD	0 sigpending
-53	STD	2 sigaltstack
-54	STD	3 ioctl
-55	STD	1 reboot
-56	STD	1 revoke
-57	STD	2 symlink
-58	STD	3 readlink
-59	STD	3 execve
-60	STD	1 umask
-61	STD	1 chroot
-62	COMPAT	2 fstat
-63	COMPAT	4 getkerninfo
-64	COMPAT	0 getpagesize
-65	STD	2 msync
-66	STD	0 vfork
-67	OBSOL	0 vread
-68	OBSOL	0 vwrite
-69	STD	1 sbrk
-70	STD	1 sstk
-71	COMPAT	6 mmap
-72	STD	1 ovadvise vadvise
-73	STD	2 munmap
-74	STD	3 mprotect
-75	STD	3 madvise
-76	OBSOL	0 vhangup
-77	OBSOL	0 vlimit
-78	STD	3 mincore
-79	STD	2 getgroups
-80	STD	2 setgroups
-81	STD	0 getpgrp
-82	STD	2 setpgid
-83	STD	3 setitimer
-84	COMPAT	0 wait
-85	STD	1 swapon
-86	STD	2 getitimer
-87	COMPAT	2 gethostname
-88	COMPAT	2 sethostname
-89	STD	0 getdtablesize
-90	STD	2 dup2
-91	UNIMPL	2 getdopt
-92	STD	3 fcntl
-93	STD	5 select
-94	UNIMPL	2 setdopt
-95	STD	1 fsync
-96	STD	3 setpriority
-97	STD	3 socket
-98	STD	3 connect
-99	COMPAT	3 accept
-100	STD	2 getpriority
-101	COMPAT	4 send
-102	COMPAT	4 recv
-103	STD	1 sigreturn
-104	STD	3 bind
-105	STD	5 setsockopt
-106	STD	2 listen
-107	OBSOL	0 vtimes
-108	COMPAT	3 sigvec
-109	COMPAT	1 sigblock
-110	COMPAT	1 sigsetmask
-111	STD	1 sigsuspend
-112	COMPAT	2 sigstack
-113	COMPAT	3 recvmsg
-114	COMPAT	3 sendmsg
+46	STD	3 POSIX	sigaction
+47	STD	0 POSIX	getgid
+48	STD	2 POSIX	sigprocmask
+49	STD	2 BSD	getlogin
+50	STD	1 BSD	setlogin
+51	STD	1 BSD	acct
+52	STD	0 POSIX	sigpending
+53	STD	2 BSD	sigaltstack
+54	STD	3 POSIX	ioctl
+55	STD	1 BSD	reboot
+56	STD	1 POSIX	revoke
+57	STD	2 POSIX	symlink
+58	STD	3 POSIX	readlink
+59	STD	3 POSIX	execve
+60	STD	1 POSIX	umask
+61	STD	1 BSD	chroot
+62	COMPAT	2 POSIX	fstat
+63	COMPAT	4 BSD	getkerninfo
+64	COMPAT	0 BSD	getpagesize
+65	STD	2 BSD	msync
+66	STD	0 BSD	vfork
+67	OBSOL	0 NOHIDE vread
+68	OBSOL	0 NOHIDE vwrite
+69	STD	1 BSD	sbrk
+70	STD	1 BSD	sstk
+71	COMPAT	6 BSD	mmap
+72	STD	1 BSD	ovadvise vadvise
+73	STD	2 BSD	munmap
+74	STD	3 BSD	mprotect
+75	STD	3 BSD	madvise
+76	OBSOL	0 NOHIDE vhangup
+77	OBSOL	0 NOHIDE vlimit
+78	STD	3 BSD	mincore
+79	STD	2 POSIX	getgroups
+80	STD	2 POSIX	setgroups
+81	STD	0 POSIX	getpgrp
+82	STD	2 POSIX	setpgid
+83	STD	3 BSD	setitimer
+84	COMPAT	0 BSD	wait
+85	STD	1 BSD	swapon
+86	STD	2 BSD	getitimer
+87	COMPAT	2 BSD	gethostname
+88	COMPAT	2 BSD	sethostname
+89	STD	0 BSD	getdtablesize
+90	STD	2 POSIX	dup2
+91	UNIMPL	2 BSD	getdopt
+92	STD	3 POSIX	fcntl
+93	STD	5 BSD	select
+94	UNIMPL	2 BSD	setdopt
+95	STD	1 POSIX	fsync
+96	STD	3 BSD	setpriority
+97	STD	3 BSD	socket
+98	STD	3 BSD	connect
+99	COMPAT	3 BSD	accept
+100	STD	2 BSD	getpriority
+101	COMPAT	4 BSD	send
+102	COMPAT	4 BSD	recv
+103	STD	1 BSD	sigreturn
+104	STD	3 BSD	bind
+105	STD	5 BSD	setsockopt
+106	STD	2 BSD	listen
+107	OBSOL	0 NOHIDE vtimes
+108	COMPAT	3 BSD	sigvec
+109	COMPAT	1 BSD	sigblock
+110	COMPAT	1 BSD	sigsetmask
+111	STD	1 POSIX	sigsuspend
+112	COMPAT	2 BSD	sigstack
+113	COMPAT	3 BSD	recvmsg
+114	COMPAT	3 BSD	sendmsg
 #ifdef TRACE
-115	STD	2 vtrace
+115	STD	2 BSD	vtrace
 #else
-115	OBSOL	2 vtrace
+115	OBSOL	2 NOHIDE vtrace
 #endif
-116	STD	2 gettimeofday
-117	STD	2 getrusage
-118	STD	5 getsockopt
+116	STD	2 BSD	gettimeofday
+117	STD	2 BSD	getrusage
+118	STD	5 BSD	getsockopt
 #ifdef vax
-119	STD	1 resuba
+119	STD	1 BSD	resuba
 #else
-119	UNIMPL	0 nosys
+119	UNIMPL	0 NOHIDE nosys
 #endif
-120	STD	3 readv
-121	STD	3 writev
-122	STD	2 settimeofday
-123	STD	3 fchown
-124	STD	2 fchmod
-125	COMPAT	6 recvfrom
-126	COMPAT	2 setreuid
-127	COMPAT	2 setregid
-128	STD	2 rename
-129	COMPAT	2 truncate
-130	COMPAT	2 ftruncate
-131	STD	2 flock
-132	STD	2 mkfifo
-133	STD	6 sendto
-134	STD	2 shutdown
-135	STD	5 socketpair
-136	STD	2 mkdir
-137	STD	1 rmdir
-138	STD	2 utimes
-139	OBSOL	0 4.2 sigreturn
-140	STD	2 adjtime
-141	COMPAT	3 getpeername
-142	COMPAT	0 gethostid
-143	COMPAT	1 sethostid
-144	COMPAT	2 getrlimit
-145	COMPAT	2 setrlimit
-146	COMPAT	2 killpg
-147	STD	0 setsid
-148	STD	4 quotactl
-149	COMPAT	4 quota
-150	COMPAT	3 getsockname
+120	STD	3 BSD	readv
+121	STD	3 BSD	writev
+122	STD	2 BSD	settimeofday
+123	STD	3 BSD	fchown
+124	STD	2 BSD	fchmod
+125	COMPAT	6 BSD	recvfrom
+126	COMPAT	2 BSD	setreuid
+127	COMPAT	2 BSD	setregid
+128	STD	2 POSIX	rename
+129	COMPAT	2 BSD	truncate
+130	COMPAT	2 BSD	ftruncate
+131	STD	2 BSD	flock
+132	STD	2 POSIX	mkfifo
+133	STD	6 BSD	sendto
+134	STD	2 BSD	shutdown
+135	STD	5 BSD	socketpair
+136	STD	2 POSIX	mkdir
+137	STD	1 POSIX	rmdir
+138	STD	2 BSD	utimes
+139	OBSOL	0 NOHIDE 4.2 sigreturn
+140	STD	2 BSD	adjtime
+141	COMPAT	3 BSD	getpeername
+142	COMPAT	0 BSD	gethostid
+143	COMPAT	1 BSD	sethostid
+144	COMPAT	2 BSD	getrlimit
+145	COMPAT	2 BSD	setrlimit
+146	COMPAT	2 BSD	killpg
+147	STD	0 POSIX	setsid
+148	STD	4 BSD	quotactl
+149	COMPAT	4 BSD	quota
+150	COMPAT	3 BSD	getsockname
 
 ; Syscalls 151-180 inclusive are reserved for vendor-specific
 ; system calls.  (This includes various calls added for compatibity
 ; with other Unix variants.)
 ; Some of these calls are now supported by BSD...
-151	UNIMPL	0 nosys
-152	UNIMPL	0 nosys
-153	UNIMPL	0 nosys
-154	UNIMPL	0 nosys
+151	UNIMPL	0 NOHIDE nosys
+152	UNIMPL	0 NOHIDE nosys
+153	UNIMPL	0 NOHIDE nosys
+154	UNIMPL	0 NOHIDE nosys
 #ifdef NFS
-155	STD	2 nfssvc
+155	STD	2 BSD	nfssvc
 #else
-155	UNIMPL	0 nosys
+155	UNIMPL	0 BSD	nosys
 #endif
-156	COMPAT	4 getdirentries
-157	STD	2 statfs
-158	STD	2 fstatfs
-159	UNIMPL	0 nosys
-160	UNIMPL	0 nosys
+156	COMPAT	4 BSD	getdirentries
+157	STD	2 BSD	statfs
+158	STD	2 BSD	fstatfs
+159	UNIMPL	0 NOHIDE nosys
+160	UNIMPL	0 NOHIDE nosys
 #ifdef NFS
-161	STD	2 getfh
+161	STD	2 BSD	getfh
 #else
-161	UNIMPL	0 nosys
+161	UNIMPL	0 BSD	nosys
 #endif
-162	STD	2 getdomainname
-163	STD	2 setdomainname
-164	STD	1 uname
-165	STD	2 sysarch
-166	STD	2 rtprio
-167	UNIMPL	0 nosys
-168	UNIMPL	0 nosys
-169	UNIMPL	0 nosys
-170	UNIMPL	0 nosys
+162	STD	2 BSD	getdomainname
+163	STD	2 BSD	setdomainname
+164	STD	1 BSD	uname
+165	STD	2 BSD	sysarch
+166	STD	2 BSD	rtprio
+167	UNIMPL	0 NOHIDE nosys
+168	UNIMPL	0 NOHIDE nosys
+169	UNIMPL	0 NOHIDE nosys
+170	UNIMPL	0 NOHIDE nosys
 #ifdef SYSVSHM
-171	STD	4 shmsys
+171	STD	4 BSD	shmsys
 #else
-171	UNIMPL	0 nosys
+171	UNIMPL	0 BSD	nosys
 #endif
-172	UNIMPL	0 nosys
-173	UNIMPL	0 nosys
-174	UNIMPL	0 nosys
-175	STD	1 nosys ntp_gettime
-176	STD	1 nosys ntp_adjtime
-177	UNIMPL	0 nosys
-178	UNIMPL	0 nosys
-179	UNIMPL	0 nosys
-180	UNIMPL	0 nosys
+172	UNIMPL	0 NOHIDE nosys
+173	UNIMPL	0 NOHIDE nosys
+174	UNIMPL	0 NOHIDE nosys
+175	STD	1 BSD	nosys ntp_gettime
+176	STD	1 BSD	nosys ntp_adjtime
+177	UNIMPL	0 NOHIDE nosys
+178	UNIMPL	0 NOHIDE nosys
+179	UNIMPL	0 NOHIDE nosys
+180	UNIMPL	0 NOHIDE nosys
 
 ; Syscalls 180-199 are used by/reserved for BSD
-181	STD	1 setgid
-182	STD	1 setegid
-183	STD	1 seteuid
+181	STD	1 POSIX	setgid
+182	STD	1 BSD	setegid
+183	STD	1 BSD	seteuid
 #ifdef LFS
-184	STD	3 lfs_bmapv
-185	STD	3 lfs_markv
-186	STD	2 lfs_segclean
-187	STD	2 lfs_segwait
+184	STD	3 BSD	lfs_bmapv
+185	STD	3 BSD	lfs_markv
+186	STD	2 BSD	lfs_segclean
+187	STD	2 BSD	lfs_segwait
 #else
-184	UNIMPL	0 nosys
-185	UNIMPL	0 nosys
-186	UNIMPL	0 nosys
-187	UNIMPL	0 nosys
+184	UNIMPL	0 BSD	nosys
+185	UNIMPL	0 BSD	nosys
+186	UNIMPL	0 BSD	nosys
+187	UNIMPL	0 BSD	nosys
 #endif
-188	STD	2 stat
-189	STD	2 fstat
-190	STD	2 lstat
-191	STD	2 pathconf
-192	STD	2 fpathconf
-193	UNIMPL	0 nosys
-194	STD	2 getrlimit
-195	STD	2 setrlimit
-196	STD	4 getdirentries
-197	STD	8 mmap
-198	STD	0 nosys __syscall
-199	STD	5 lseek
-200	STD	4 truncate
-201	STD	4 ftruncate
-202	STD	6 __sysctl
-203	STD	2 mlock
-204	STD	2 munlock
-205	UNIMPL	0 nosys
-206	UNIMPL	0 nosys
-207	UNIMPL	0 nosys
-208	UNIMPL	0 nosys
-209	UNIMPL	0 nosys
+188	STD	2 POSIX	stat
+189	STD	2 POSIX	fstat
+190	STD	2 POSIX	lstat
+191	STD	2 POSIX	pathconf
+192	STD	2 POSIX	fpathconf
+193	UNIMPL	0 NOHIDE nosys
+194	STD	2 BSD	getrlimit
+195	STD	2 BSD	setrlimit
+196	STD	4 BSD	getdirentries
+197	STD	8 BSD	mmap
+198	STD	0 NOHIDE nosys __syscall
+199	STD	5 POSIX	lseek
+200	STD	4 BSD	truncate
+201	STD	4 BSD	ftruncate
+202	STD	6 BSD	__sysctl
+; properly, __sysctl should be a NOHIDE, but making an exception
+; here allows to avoid one in libc/sys/Makefile.inc.
+203	STD	2 BSD	mlock
+204	STD	2 BSD	munlock
+205	UNIMPL	0 NOHIDE nosys
+206	UNIMPL	0 NOHIDE nosys
+207	UNIMPL	0 NOHIDE nosys
+208	UNIMPL	0 NOHIDE nosys
+209	UNIMPL	0 NOHIDE nosys
 
 ;
 ; The following are reserved for loadable syscalls
 ;
 #ifdef LKM
-210	NODEF	0 lkmnosys
-211	NODEF	0 lkmnosys
-212	NODEF	0 lkmnosys
-213	NODEF	0 lkmnosys
-214	NODEF	0 lkmnosys
-215	NODEF	0 lkmnosys
-216	NODEF	0 lkmnosys
-217	NODEF	0 lkmnosys
-218	NODEF	0 lkmnosys
-219	NODEF	0 lkmnosys
+210	NODEF	0 NOHIDE lkmnosys
+211	NODEF	0 NOHIDE lkmnosys
+212	NODEF	0 NOHIDE lkmnosys
+213	NODEF	0 NOHIDE lkmnosys
+214	NODEF	0 NOHIDE lkmnosys
+215	NODEF	0 NOHIDE lkmnosys
+216	NODEF	0 NOHIDE lkmnosys
+217	NODEF	0 NOHIDE lkmnosys
+218	NODEF	0 NOHIDE lkmnosys
+219	NODEF	0 NOHIDE lkmnosys
 #else
-210	UNIMPL	0 nosys
-211	UNIMPL	0 nosys
-212	UNIMPL	0 nosys
-213	UNIMPL	0 nosys
-214	UNIMPL	0 nosys
-215	UNIMPL	0 nosys
-216	UNIMPL	0 nosys
-217	UNIMPL	0 nosys
-218	UNIMPL	0 nosys
-219	UNIMPL	0 nosys
+210	UNIMPL	0 NOHIDE nosys
+211	UNIMPL	0 NOHIDE nosys
+212	UNIMPL	0 NOHIDE nosys
+213	UNIMPL	0 NOHIDE nosys
+214	UNIMPL	0 NOHIDE nosys
+215	UNIMPL	0 NOHIDE nosys
+216	UNIMPL	0 NOHIDE nosys
+217	UNIMPL	0 NOHIDE nosys
+218	UNIMPL	0 NOHIDE nosys
+219	UNIMPL	0 NOHIDE nosys
 #endif