remove all the old COMPAT_43 syscalls. The option itself remains for

the other things it enables.  Move a few old wrappers into linux compat
where they are still being used.
ok deraadt guenther

1 files changed, 34 insertions, 56 deletions

diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 376c7f66502..bc5544b872d 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.108 2011/06/30 13:43:14 tedu Exp $
+;	$OpenBSD: syscalls.master,v 1.109 2011/07/07 01:19:40 tedu Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -60,7 +60,7 @@
 6	STD		{ int sys_close(int fd); }
 7	STD		{ pid_t sys_wait4(pid_t pid, int *status, int options, \
 			    struct rusage *rusage); }
-8	COMPAT_43	{ int sys_creat(const char *path, mode_t mode); } ocreat
+8	OBSOL		ocreat
 9	STD		{ int sys_link(const char *path, const char *link); }
 10	STD		{ int sys_unlink(const char *path); }
 11	OBSOL		execv
@@ -74,8 +74,7 @@
 17	STD		{ int sys_obreak(char *nsize); } break
 18	COMPAT_25	{ int sys_getfsstat(struct statfs *buf, long bufsize, \
 			    int flags); } ogetfsstat
-19	COMPAT_43	{ long sys_lseek(int fd, long offset, int whence); } \
-			    olseek
+19	OBSOL		olseek
 20	STD		{ pid_t sys_getpid(void); }
 21	STD		{ int sys_mount(const char *type, const char *path, \
 			    int flags, void *data); }
@@ -107,11 +106,9 @@
 35	STD		{ int sys_fchflags(int fd, u_int flags); }
 36	STD		{ void sys_sync(void); }
 37	STD		{ int sys_kill(int pid, int signum); }
-38	COMPAT_43	{ int sys_stat(const char *path, struct stat43 *ub); } \
-			    stat43
+38	OBSOL		stat43
 39	STD		{ pid_t sys_getppid(void); }
-40	COMPAT_43	{ int sys_lstat(char *path, \
-			    struct stat43 *ub); } lstat43
+40	OBSOL		lstat43
 41	STD		{ int sys_dup(int fd); }
 42	STD		{ int sys_opipe(void); }
 43	STD		{ gid_t sys_getegid(void); }
@@ -150,18 +147,16 @@
 			    char * const *argp, char * const *envp); }
 60	STD		{ mode_t sys_umask(mode_t newmask); }
 61	STD		{ int sys_chroot(const char *path); }
-62	COMPAT_43	{ int sys_fstat(int fd, struct stat43 *sb); } fstat43
-63	COMPAT_43	{ int sys_getkerninfo(int op, char *where, int *size, \
-			    int arg); } ogetkerninfo
-64	COMPAT_43	{ int sys_getpagesize(void); } ogetpagesize
+62	OBSOL		fstat43
+63	OBSOL		ogetkerninfo
+64	OBSOL		ogetpagesize
 65	COMPAT_25	{ int sys_omsync(caddr_t addr, size_t len); }
 66	STD		{ int sys_vfork(void); }
 67	OBSOL		vread
 68	OBSOL		vwrite
 69	STD		{ int sys_sbrk(int incr); }
 70	STD		{ int sys_sstk(int incr); }
-71	COMPAT_43	{ int sys_mmap(caddr_t addr, size_t len, int prot, \
-			    int flags, int fd, long pos); } ommap
+71	OBSOL		ommap
 72	OBSOL		vadvise
 73	STD		{ int sys_munmap(void *addr, size_t len); }
 74	STD		{ int sys_mprotect(void *addr, size_t len, \
@@ -181,15 +176,13 @@
 83	STD		{ int sys_setitimer(int which, \
 			    const struct itimerval *itv, \
 			    struct itimerval *oitv); }
-84	COMPAT_43	{ int sys_wait(void); } owait
+84	OBSOL		owait
 85	COMPAT_25	{ int sys_swapon(const char *name); }
 86	STD		{ int sys_getitimer(int which, \
 			    struct itimerval *itv); }
-87	COMPAT_43	{ int sys_gethostname(char *hostname, u_int len); } \
-			    ogethostname
-88	COMPAT_43	{ int sys_sethostname(char *hostname, u_int len); } \
-			    osethostname
-89	COMPAT_43	{ int sys_getdtablesize(void); } ogetdtablesize
+87	OBSOL		ogethostname
+88	OBSOL		osethostname
+89	OBSOL		ogetdtablesize
 90	STD		{ int sys_dup2(int from, int to); }
 91	UNIMPL		getdopt
 92	STD		{ int sys_fcntl(int fd, int cmd, ... void *arg); }
@@ -201,13 +194,10 @@
 97	STD		{ int sys_socket(int domain, int type, int protocol); }
 98	STD		{ int sys_connect(int s, const struct sockaddr *name, \
 			    socklen_t namelen); }
-99	COMPAT_43	{ int sys_accept(int s, caddr_t name, \
-			    int *anamelen); } oaccept
+99	OBSOL		oaccept
 100	STD		{ int sys_getpriority(int which, id_t who); }
-101	COMPAT_43	{ int sys_send(int s, caddr_t buf, int len, \
-			    int flags); } osend
-102	COMPAT_43	{ int sys_recv(int s, caddr_t buf, int len, \
-			    int flags); } orecv
+101	OBSOL	osend
+102	OBSOL	orecv
 103	STD		{ int sys_sigreturn(struct sigcontext *sigcntxp); }
 104	STD		{ int sys_bind(int s, const struct sockaddr *name, \
 			    socklen_t namelen); }
@@ -215,17 +205,13 @@
 			    const void *val, socklen_t valsize); }
 106	STD		{ int sys_listen(int s, int backlog); }
 107	OBSOL		vtimes
-108	COMPAT_43	{ int sys_sigvec(int signum, struct sigvec *nsv, \
-			    struct sigvec *osv); } osigvec
-109	COMPAT_43	{ int sys_sigblock(int mask); } osigblock
-110	COMPAT_43	{ int sys_sigsetmask(int mask); } osigsetmask
+108	OBSOL		osigvec
+109	OBSOL		osigblock
+110	OBSOL		osigsetmask
 111	STD		{ int sys_sigsuspend(int mask); }
-112	COMPAT_43	{ int sys_sigstack(struct sigstack *nss, \
-			    struct sigstack *oss); } osigstack
-113	COMPAT_43	{ int sys_recvmsg(int s, struct omsghdr *msg, \
-			    int flags); } orecvmsg
-114	COMPAT_43	{ int sys_sendmsg(int s, caddr_t msg, int flags); } \
-			    osendmsg
+112	OBSOL		osigstack
+113	OBSOL		orecvmsg
+114	OBSOL		osendmsg
 115	OBSOL		vtrace
 116	STD NOLOCK	{ int sys_gettimeofday(struct timeval *tp, \
 			    struct timezone *tzp); }
@@ -241,15 +227,12 @@
 			    const struct timezone *tzp); }
 123	STD		{ int sys_fchown(int fd, uid_t uid, gid_t gid); }
 124	STD		{ int sys_fchmod(int fd, mode_t mode); }
-125	COMPAT_43	{ int sys_recvfrom(int s, caddr_t buf, size_t len, \
-			    int flags, caddr_t from, int *fromlenaddr); } \
-			    orecvfrom
+125	OBSOL		orecvfrom
 126	STD		{ int sys_setreuid(uid_t ruid, uid_t euid); }
 127	STD		{ int sys_setregid(gid_t rgid, gid_t egid); }
 128	STD		{ int sys_rename(const char *from, const char *to); }
-129	COMPAT_43	{ int sys_truncate(const char *path, long length); } \
-			    otruncate
-130	COMPAT_43	{ int sys_ftruncate(int fd, long length); } oftruncate
+129	OBSOL		otruncate
+130	OBSOL		oftruncate
 131	STD		{ int sys_flock(int fd, int how); }
 132	STD		{ int sys_mkfifo(const char *path, mode_t mode); }
 133	STD		{ ssize_t sys_sendto(int s, const void *buf, \
@@ -265,21 +248,17 @@
 139	OBSOL		4.2 sigreturn
 140	STD		{ int sys_adjtime(const struct timeval *delta, \
 			    struct timeval *olddelta); }
-141	COMPAT_43	{ int sys_getpeername(int fdes, caddr_t asa, \
-			    socklen_t *alen); } ogetpeername
-142	COMPAT_43	{ int32_t sys_gethostid(void); } ogethostid
-143	COMPAT_43	{ int sys_sethostid(int32_t hostid); } osethostid
-144	COMPAT_43	{ int sys_getrlimit(int which, \
-			    struct ogetrlimit *rlp); } ogetrlimit
-145	COMPAT_43	{ int sys_setrlimit(int which, \
-			    struct ogetrlimit *rlp); } osetrlimit
-146	COMPAT_43	{ int sys_killpg(int pgid, int signum); } okillpg
+141	OBSOL		ogetpeername
+142	OBSOL		ogethostid
+143	OBSOL		osethostid
+144	OBSOL		ogetrlimit
+145	OBSOL		osetrlimit
+146	OBSOL		okillpg
 147	STD		{ int sys_setsid(void); }
 148	STD		{ int sys_quotactl(const char *path, int cmd, \
 			    int uid, char *arg); }
-149	COMPAT_43	{ int sys_quota(void); } oquota
-150	COMPAT_43	{ int sys_getsockname(int fdec, caddr_t asa, \
-			    int *alen); } ogetsockname
+149	OBSOL		oquota
+150	OBSOL		ogetsockname
 
 ; Syscalls 151-180 inclusive are reserved for vendor-specific
 ; system calls.  (This includes various calls added for compatibility
@@ -294,8 +273,7 @@
 #else
 155	UNIMPL
 #endif
-156	COMPAT_43	{ int sys_getdirentries(int fd, char *buf, \
-			    int count, long *basep); } ogetdirentries
+156	OBSOL		ogetdirentries
 157	COMPAT_25	{ int sys_statfs(const char *path, \
 			    struct ostatfs *buf); } ostatfs
 158	COMPAT_25	{ int sys_fstatfs(int fd, struct ostatfs *buf); } \