sync

32 files changed, 1118 insertions, 84 deletions

diff --git a/sys/compat/bsdos/bsdos_syscall.h b/sys/compat/bsdos/bsdos_syscall.h
index 2c44efe9517..c11fe786b6b 100644
--- a/sys/compat/bsdos/bsdos_syscall.h
+++ b/sys/compat/bsdos/bsdos_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_syscall.h,v 1.4 1999/05/31 18:18:05 millert Exp $	*/
+/*	$OpenBSD: bsdos_syscall.h,v 1.5 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1999/05/31 17:34:44 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1999/06/07 07:17:46 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -131,8 +131,8 @@
 /* syscall: "dup" ret: "int" args: "u_int" */
 #define	BSDOS_SYS_dup	41
 
-/* syscall: "pipe" ret: "int" args: */
-#define	BSDOS_SYS_pipe	42
+/* syscall: "opipe" ret: "int" args: */
+#define	BSDOS_SYS_opipe	42
 
 /* syscall: "getegid" ret: "gid_t" args: */
 #define	BSDOS_SYS_getegid	43
diff --git a/sys/compat/bsdos/bsdos_syscallargs.h b/sys/compat/bsdos/bsdos_syscallargs.h
index 713f67441fa..6429f1af4f5 100644
--- a/sys/compat/bsdos/bsdos_syscallargs.h
+++ b/sys/compat/bsdos/bsdos_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_syscallargs.h,v 1.4 1999/05/31 18:18:06 millert Exp $	*/
+/*	$OpenBSD: bsdos_syscallargs.h,v 1.5 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1999/05/31 17:34:44 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1999/06/07 07:17:46 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -54,7 +54,7 @@ int	compat_43_sys_stat	__P((struct proc *, void *, register_t *));
 int	sys_getppid	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_lstat	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	sys_getegid	__P((struct proc *, void *, register_t *));
 int	sys_profil	__P((struct proc *, void *, register_t *));
 #ifdef KTRACE
diff --git a/sys/compat/bsdos/bsdos_syscalls.c b/sys/compat/bsdos/bsdos_syscalls.c
index c5ca9968a82..019ae81a45d 100644
--- a/sys/compat/bsdos/bsdos_syscalls.c
+++ b/sys/compat/bsdos/bsdos_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_syscalls.c,v 1.4 1999/05/31 18:18:06 millert Exp $	*/
+/*	$OpenBSD: bsdos_syscalls.c,v 1.5 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1999/05/31 17:34:44 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1999/06/07 07:17:46 deraadt Exp 
  */
 
 char *bsdos_syscallnames[] = {
@@ -50,7 +50,7 @@ char *bsdos_syscallnames[] = {
 	"getppid",			/* 39 = getppid */
 	"olstat",			/* 40 = olstat */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"getegid",			/* 43 = getegid */
 	"profil",			/* 44 = profil */
 #ifdef KTRACE
diff --git a/sys/compat/bsdos/bsdos_sysent.c b/sys/compat/bsdos/bsdos_sysent.c
index ba26948a2f3..e26bb2b0794 100644
--- a/sys/compat/bsdos/bsdos_sysent.c
+++ b/sys/compat/bsdos/bsdos_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_sysent.c,v 1.4 1999/05/31 18:18:06 millert Exp $	*/
+/*	$OpenBSD: bsdos_sysent.c,v 1.5 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1999/05/31 17:34:44 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1999/06/07 07:17:46 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -102,7 +102,7 @@ struct sysent bsdos_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 0, 0,
 	    sys_getegid },			/* 43 = getegid */
 	{ 4, s(struct sys_profil_args),
diff --git a/sys/compat/freebsd/freebsd_syscall.h b/sys/compat/freebsd/freebsd_syscall.h
index 6162cbd8a0c..df0a5cc531d 100644
--- a/sys/compat/freebsd/freebsd_syscall.h
+++ b/sys/compat/freebsd/freebsd_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_syscall.h,v 1.10 1999/05/31 18:18:09 millert Exp $	*/
+/*	$OpenBSD: freebsd_syscall.h,v 1.11 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1999/05/31 17:34:45 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:46 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -131,8 +131,8 @@
 /* syscall: "dup" ret: "int" args: "u_int" */
 #define	FREEBSD_SYS_dup	41
 
-/* syscall: "pipe" ret: "int" args: */
-#define	FREEBSD_SYS_pipe	42
+/* syscall: "opipe" ret: "int" args: */
+#define	FREEBSD_SYS_opipe	42
 
 /* syscall: "getegid" ret: "gid_t" args: */
 #define	FREEBSD_SYS_getegid	43
diff --git a/sys/compat/freebsd/freebsd_syscallargs.h b/sys/compat/freebsd/freebsd_syscallargs.h
index cedd3298328..8e3d5f66338 100644
--- a/sys/compat/freebsd/freebsd_syscallargs.h
+++ b/sys/compat/freebsd/freebsd_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_syscallargs.h,v 1.11 1999/05/31 18:18:09 millert Exp $	*/
+/*	$OpenBSD: freebsd_syscallargs.h,v 1.12 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1999/05/31 17:34:45 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:46 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -261,7 +261,7 @@ int	compat_43_freebsd_sys_stat	__P((struct proc *, void *, register_t *));
 int	sys_getppid	__P((struct proc *, void *, register_t *));
 int	compat_43_freebsd_sys_lstat	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	sys_getegid	__P((struct proc *, void *, register_t *));
 int	sys_profil	__P((struct proc *, void *, register_t *));
 #ifdef KTRACE
diff --git a/sys/compat/freebsd/freebsd_syscalls.c b/sys/compat/freebsd/freebsd_syscalls.c
index 7f376157288..d0f8b13acfd 100644
--- a/sys/compat/freebsd/freebsd_syscalls.c
+++ b/sys/compat/freebsd/freebsd_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_syscalls.c,v 1.10 1999/05/31 18:18:09 millert Exp $	*/
+/*	$OpenBSD: freebsd_syscalls.c,v 1.11 1999/06/07 07:18:34 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1999/05/31 17:34:45 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:46 deraadt Exp 
  */
 
 char *freebsd_syscallnames[] = {
@@ -50,7 +50,7 @@ char *freebsd_syscallnames[] = {
 	"getppid",			/* 39 = getppid */
 	"olstat",			/* 40 = olstat */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"getegid",			/* 43 = getegid */
 	"profil",			/* 44 = profil */
 #ifdef KTRACE
diff --git a/sys/compat/freebsd/freebsd_sysent.c b/sys/compat/freebsd/freebsd_sysent.c
index 2e2135f77ac..c194db79bfc 100644
--- a/sys/compat/freebsd/freebsd_sysent.c
+++ b/sys/compat/freebsd/freebsd_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_sysent.c,v 1.11 1999/05/31 18:18:10 millert Exp $	*/
+/*	$OpenBSD: freebsd_sysent.c,v 1.12 1999/06/07 07:18:35 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1999/05/31 17:34:45 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:46 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -103,7 +103,7 @@ struct sysent freebsd_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 0, 0,
 	    sys_getegid },			/* 43 = getegid */
 	{ 4, s(struct sys_profil_args),
diff --git a/sys/compat/hpux/hpux_syscall.h b/sys/compat/hpux/hpux_syscall.h
index d328653dc03..3eeb46d576d 100644
--- a/sys/compat/hpux/hpux_syscall.h
+++ b/sys/compat/hpux/hpux_syscall.h
@@ -1,151 +1,439 @@
+/*	$OpenBSD: hpux_syscall.h,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1997/03/26 08:11:09 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:46 deraadt Exp 
  */
 
+/* syscall: "syscall" ret: "int" args: */
 #define	HPUX_SYS_syscall	0
+
+/* syscall: "exit" ret: "int" args: "int" */
 #define	HPUX_SYS_exit	1
+
+/* syscall: "fork" ret: "int" args: */
 #define	HPUX_SYS_fork	2
+
+/* syscall: "read" ret: "int" args: "int" "char *" "u_int" */
 #define	HPUX_SYS_read	3
+
+/* syscall: "write" ret: "int" args: "int" "char *" "u_int" */
 #define	HPUX_SYS_write	4
+
+/* syscall: "open" ret: "int" args: "char *" "int" "int" */
 #define	HPUX_SYS_open	5
+
+/* syscall: "close" ret: "int" args: "int" */
 #define	HPUX_SYS_close	6
+
+/* syscall: "wait" ret: "int" args: "int *" */
 #define	HPUX_SYS_wait	7
+
+/* syscall: "creat" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_creat	8
+
+/* syscall: "link" ret: "int" args: "char *" "char *" */
 #define	HPUX_SYS_link	9
+
+/* syscall: "unlink" ret: "int" args: "char *" */
 #define	HPUX_SYS_unlink	10
+
+/* syscall: "execv" ret: "int" args: "char *" "char **" */
 #define	HPUX_SYS_execv	11
+
+/* syscall: "chdir" ret: "int" args: "char *" */
 #define	HPUX_SYS_chdir	12
+
+/* syscall: "time_6x" ret: "int" args: "time_t *" */
 #define	HPUX_SYS_time_6x	13
+
+/* syscall: "mknod" ret: "int" args: "char *" "int" "int" */
 #define	HPUX_SYS_mknod	14
+
+/* syscall: "chmod" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_chmod	15
+
+/* syscall: "chown" ret: "int" args: "char *" "int" "int" */
 #define	HPUX_SYS_chown	16
+
+/* syscall: "obreak" ret: "int" args: "char *" */
 #define	HPUX_SYS_obreak	17
+
+/* syscall: "stat_6x" ret: "int" args: "char *" "struct hpux_ostat *" */
 #define	HPUX_SYS_stat_6x	18
+
+/* syscall: "lseek" ret: "long" args: "int" "long" "int" */
 #define	HPUX_SYS_lseek	19
+
+/* syscall: "getpid" ret: "pid_t" args: */
 #define	HPUX_SYS_getpid	20
+
+/* syscall: "setuid" ret: "int" args: "uid_t" */
 #define	HPUX_SYS_setuid	23
+
+/* syscall: "getuid" ret: "uid_t" args: */
 #define	HPUX_SYS_getuid	24
+
+/* syscall: "stime_6x" ret: "int" args: "int" */
 #define	HPUX_SYS_stime_6x	25
+
+/* syscall: "ptrace" ret: "int" args: "int" "int" "int *" "int" */
 #define	HPUX_SYS_ptrace	26
+
+/* syscall: "alarm_6x" ret: "int" args: "int" */
 #define	HPUX_SYS_alarm_6x	27
+
+/* syscall: "fstat_6x" ret: "int" args: "int" "struct hpux_ostat *" */
 #define	HPUX_SYS_fstat_6x	28
+
+/* syscall: "pause_6x" ret: "int" args: */
 #define	HPUX_SYS_pause_6x	29
+
+/* syscall: "utime_6x" ret: "int" args: "char *" "time_t *" */
 #define	HPUX_SYS_utime_6x	30
+
+/* syscall: "stty_6x" ret: "int" args: "int" "caddr_t" */
 #define	HPUX_SYS_stty_6x	31
+
+/* syscall: "gtty_6x" ret: "int" args: "int" "caddr_t" */
 #define	HPUX_SYS_gtty_6x	32
+
+/* syscall: "access" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_access	33
+
+/* syscall: "nice_6x" ret: "int" args: "int" */
 #define	HPUX_SYS_nice_6x	34
+
+/* syscall: "ftime_6x" ret: "int" args: "struct hpux_timeb *" */
 #define	HPUX_SYS_ftime_6x	35
+
+/* syscall: "sync" ret: "int" args: */
 #define	HPUX_SYS_sync	36
+
+/* syscall: "kill" ret: "int" args: "pid_t" "int" */
 #define	HPUX_SYS_kill	37
+
+/* syscall: "stat" ret: "int" args: "char *" "struct hpux_stat *" */
 #define	HPUX_SYS_stat	38
+
+/* syscall: "setpgrp_6x" ret: "int" args: */
 #define	HPUX_SYS_setpgrp_6x	39
+
+/* syscall: "lstat" ret: "int" args: "char *" "struct hpux_stat *" */
 #define	HPUX_SYS_lstat	40
+
+/* syscall: "dup" ret: "int" args: "int" */
 #define	HPUX_SYS_dup	41
-#define	HPUX_SYS_pipe	42
+
+/* syscall: "opipe" ret: "int" args: */
+#define	HPUX_SYS_opipe	42
+
+/* syscall: "times_6x" ret: "int" args: "struct tms *" */
 #define	HPUX_SYS_times_6x	43
+
+/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */
 #define	HPUX_SYS_profil	44
+
+/* syscall: "setgid" ret: "int" args: "gid_t" */
 #define	HPUX_SYS_setgid	46
+
+/* syscall: "getgid" ret: "gid_t" args: */
 #define	HPUX_SYS_getgid	47
+
+/* syscall: "ssig_6x" ret: "int" args: "int" "sig_t" */
 #define	HPUX_SYS_ssig_6x	48
+
+/* syscall: "ioctl" ret: "int" args: "int" "int" "caddr_t" */
 #define	HPUX_SYS_ioctl	54
+
+/* syscall: "symlink" ret: "int" args: "char *" "char *" */
 #define	HPUX_SYS_symlink	56
+
+/* syscall: "utssys" ret: "int" args: "struct hpux_utsname *" "int" "int" */
 #define	HPUX_SYS_utssys	57
+
+/* syscall: "readlink" ret: "int" args: "char *" "char *" "int" */
 #define	HPUX_SYS_readlink	58
+
+/* syscall: "execve" ret: "int" args: "char *" "char **" "char **" */
 #define	HPUX_SYS_execve	59
+
+/* syscall: "umask" ret: "int" args: "int" */
 #define	HPUX_SYS_umask	60
+
+/* syscall: "chroot" ret: "int" args: "char *" */
 #define	HPUX_SYS_chroot	61
+
+/* syscall: "fcntl" ret: "int" args: "int" "int" "int" */
 #define	HPUX_SYS_fcntl	62
+
+/* syscall: "ulimit" ret: "int" args: "int" "int" */
 #define	HPUX_SYS_ulimit	63
+
+/* syscall: "vfork" ret: "int" args: */
 #define	HPUX_SYS_vfork	66
+
+/* syscall: "vread" ret: "int" args: "int" "char *" "u_int" */
 #define	HPUX_SYS_vread	67
+
+/* syscall: "vwrite" ret: "int" args: "int" "char *" "u_int" */
 #define	HPUX_SYS_vwrite	68
+
+/* syscall: "mmap" ret: "int" args: "caddr_t" "size_t" "int" "int" "int" "long" */
 #define	HPUX_SYS_mmap	71
+
+/* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	HPUX_SYS_munmap	73
+
+/* syscall: "mprotect" ret: "int" args: "caddr_t" "size_t" "int" */
 #define	HPUX_SYS_mprotect	74
+
+/* syscall: "getgroups" ret: "int" args: "u_int" "gid_t *" */
 #define	HPUX_SYS_getgroups	79
+
+/* syscall: "setgroups" ret: "int" args: "u_int" "gid_t *" */
 #define	HPUX_SYS_setgroups	80
+
+/* syscall: "getpgrp2" ret: "int" args: "pid_t" */
 #define	HPUX_SYS_getpgrp2	81
+
+/* syscall: "setpgrp2" ret: "int" args: "pid_t" "pid_t" */
 #define	HPUX_SYS_setpgrp2	82
+
+/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval *" "struct itimerval *" */
 #define	HPUX_SYS_setitimer	83
+
+/* syscall: "wait3" ret: "int" args: "int *" "int" "int" */
 #define	HPUX_SYS_wait3	84
+
+/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval *" */
 #define	HPUX_SYS_getitimer	86
+
+/* syscall: "dup2" ret: "int" args: "u_int" "u_int" */
 #define	HPUX_SYS_dup2	90
+
+/* syscall: "fstat" ret: "int" args: "int" "struct hpux_stat *" */
 #define	HPUX_SYS_fstat	92
+
+/* syscall: "select" ret: "int" args: "u_int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
 #define	HPUX_SYS_select	93
+
+/* syscall: "fsync" ret: "int" args: "int" */
 #define	HPUX_SYS_fsync	95
+
+/* syscall: "sigreturn" ret: "int" args: "struct hpuxsigcontext *" */
 #define	HPUX_SYS_sigreturn	103
+
+/* syscall: "sigvec" ret: "int" args: "int" "struct sigvec *" "struct sigvec *" */
 #define	HPUX_SYS_sigvec	108
+
+/* syscall: "sigblock" ret: "int" args: "int" */
 #define	HPUX_SYS_sigblock	109
+
+/* syscall: "sigsetmask" ret: "int" args: "int" */
 #define	HPUX_SYS_sigsetmask	110
+
+/* syscall: "sigpause" ret: "int" args: "int" */
 #define	HPUX_SYS_sigpause	111
+
+/* syscall: "sigstack" ret: "int" args: "struct sigstack *" "struct sigstack *" */
 #define	HPUX_SYS_sigstack	112
+
+/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" */
 #define	HPUX_SYS_gettimeofday	116
+
+/* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */
 #define	HPUX_SYS_readv	120
+
+/* syscall: "writev" ret: "int" args: "int" "struct iovec *" "u_int" */
 #define	HPUX_SYS_writev	121
+
+/* syscall: "settimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
 #define	HPUX_SYS_settimeofday	122
+
+/* syscall: "fchown" ret: "int" args: "int" "int" "int" */
 #define	HPUX_SYS_fchown	123
+
+/* syscall: "fchmod" ret: "int" args: "int" "int" */
 #define	HPUX_SYS_fchmod	124
+
+/* syscall: "setresuid" ret: "int" args: "uid_t" "uid_t" "uid_t" */
 #define	HPUX_SYS_setresuid	126
+
+/* syscall: "setresgid" ret: "int" args: "gid_t" "gid_t" "gid_t" */
 #define	HPUX_SYS_setresgid	127
+
+/* syscall: "rename" ret: "int" args: "char *" "char *" */
 #define	HPUX_SYS_rename	128
+
+/* syscall: "truncate" ret: "int" args: "char *" "long" */
 #define	HPUX_SYS_truncate	129
+
+/* syscall: "ftruncate" ret: "int" args: "int" "long" */
 #define	HPUX_SYS_ftruncate	130
+
+/* syscall: "sysconf" ret: "int" args: "int" */
 #define	HPUX_SYS_sysconf	132
+
+/* syscall: "mkdir" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_mkdir	136
+
+/* syscall: "rmdir" ret: "int" args: "char *" */
 #define	HPUX_SYS_rmdir	137
+
+/* syscall: "getrlimit" ret: "int" args: "u_int" "struct ogetrlimit *" */
 #define	HPUX_SYS_getrlimit	144
+
+/* syscall: "setrlimit" ret: "int" args: "u_int" "struct ogetrlimit *" */
 #define	HPUX_SYS_setrlimit	145
+
+/* syscall: "rtprio" ret: "int" args: "pid_t" "int" */
 #define	HPUX_SYS_rtprio	152
+
+/* syscall: "netioctl" ret: "int" args: "int" "int *" */
 #define	HPUX_SYS_netioctl	154
+
+/* syscall: "lockf" ret: "int" args: "int" "int" "long" */
 #define	HPUX_SYS_lockf	155
+
+/* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
 #define	HPUX_SYS_semget	156
+
+/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */
 #define	HPUX_SYS___semctl	157
+
+/* syscall: "semop" ret: "int" args: "int" "struct sembuf *" "u_int" */
 #define	HPUX_SYS_semop	158
+
+/* syscall: "msgget" ret: "int" args: "key_t" "int" */
 #define	HPUX_SYS_msgget	159
+
+/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */
 #define	HPUX_SYS_msgctl	160
+
+/* syscall: "msgsnd" ret: "int" args: "int" "void *" "size_t" "int" */
 #define	HPUX_SYS_msgsnd	161
+
+/* syscall: "msgrcv" ret: "int" args: "int" "void *" "size_t" "long" "int" */
 #define	HPUX_SYS_msgrcv	162
+
+/* syscall: "shmget" ret: "int" args: "key_t" "int" "int" */
 #define	HPUX_SYS_shmget	163
+
+/* syscall: "shmctl" ret: "int" args: "int" "int" "caddr_t" */
 #define	HPUX_SYS_shmctl	164
+
+/* syscall: "shmat" ret: "int" args: "int" "void *" "int" */
 #define	HPUX_SYS_shmat	165
+
+/* syscall: "shmdt" ret: "int" args: "void *" */
 #define	HPUX_SYS_shmdt	166
+
+/* syscall: "advise" ret: "int" args: "int" */
 #define	HPUX_SYS_advise	167
+
+/* syscall: "getcontext" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_getcontext	174
+
+/* syscall: "getaccess" ret: "int" args: "char *" "uid_t" "int" "gid_t *" "void *" "void *" */
 #define	HPUX_SYS_getaccess	190
+
+/* syscall: "waitpid" ret: "int" args: "pid_t" "int *" "int" "struct rusage *" */
 #define	HPUX_SYS_waitpid	200
+
+/* syscall: "pathconf" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_pathconf	225
+
+/* syscall: "fpathconf" ret: "int" args: "int" "int" */
 #define	HPUX_SYS_fpathconf	226
+
+/* syscall: "getdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
 #define	HPUX_SYS_getdirentries	231
+
+/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_getdomainname	232
+
+/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
 #define	HPUX_SYS_setdomainname	236
+
+/* syscall: "sigaction" ret: "int" args: "int" "struct hpux_sigaction *" "struct hpux_sigaction *" */
 #define	HPUX_SYS_sigaction	239
+
+/* syscall: "sigprocmask" ret: "int" args: "int" "hpux_sigset_t *" "hpux_sigset_t *" */
 #define	HPUX_SYS_sigprocmask	240
+
+/* syscall: "sigpending" ret: "int" args: "hpux_sigset_t *" */
 #define	HPUX_SYS_sigpending	241
+
+/* syscall: "sigsuspend" ret: "int" args: "hpux_sigset_t *" */
 #define	HPUX_SYS_sigsuspend	242
+
+/* syscall: "getdtablesize" ret: "int" args: */
 #define	HPUX_SYS_getdtablesize	268
+
+/* syscall: "fchdir" ret: "int" args: "int" */
 #define	HPUX_SYS_fchdir	272
+
+/* syscall: "accept" ret: "int" args: "int" "caddr_t" "int *" */
 #define	HPUX_SYS_accept	275
+
+/* syscall: "bind" ret: "int" args: "int" "caddr_t" "int" */
 #define	HPUX_SYS_bind	276
+
+/* syscall: "connect" ret: "int" args: "int" "caddr_t" "int" */
 #define	HPUX_SYS_connect	277
+
+/* syscall: "getpeername" ret: "int" args: "int" "caddr_t" "int *" */
 #define	HPUX_SYS_getpeername	278
+
+/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */
 #define	HPUX_SYS_getsockname	279
+
+/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int *" */
 #define	HPUX_SYS_getsockopt	280
+
+/* syscall: "listen" ret: "int" args: "int" "int" */
 #define	HPUX_SYS_listen	281
+
+/* syscall: "recv" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	HPUX_SYS_recv	282
+
+/* syscall: "recvfrom" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int *" */
 #define	HPUX_SYS_recvfrom	283
+
+/* syscall: "recvmsg" ret: "int" args: "int" "struct omsghdr *" "int" */
 #define	HPUX_SYS_recvmsg	284
+
+/* syscall: "send" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	HPUX_SYS_send	285
+
+/* syscall: "sendmsg" ret: "int" args: "int" "caddr_t" "int" */
 #define	HPUX_SYS_sendmsg	286
+
+/* syscall: "sendto" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int" */
 #define	HPUX_SYS_sendto	287
+
+/* syscall: "setsockopt2" ret: "int" args: "int" "int" "int" "caddr_t" "int" */
 #define	HPUX_SYS_setsockopt2	288
+
+/* syscall: "shutdown" ret: "int" args: "int" "int" */
 #define	HPUX_SYS_shutdown	289
+
+/* syscall: "socket" ret: "int" args: "int" "int" "int" */
 #define	HPUX_SYS_socket	290
+
+/* syscall: "socketpair" ret: "int" args: "int" "int" "int" "int *" */
 #define	HPUX_SYS_socketpair	291
+
+/* syscall: "nsemctl" ret: "int" args: "int" "int" "int" "union semun *" */
 #define	HPUX_SYS_nsemctl	312
+
+/* syscall: "nmsgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */
 #define	HPUX_SYS_nmsgctl	313
+
+/* syscall: "nshmctl" ret: "int" args: "int" "int" "caddr_t" */
 #define	HPUX_SYS_nshmctl	314
+
 #define	HPUX_SYS_MAXSYSCALL	315
diff --git a/sys/compat/hpux/hpux_syscallargs.h b/sys/compat/hpux/hpux_syscallargs.h
index e0ab0ca2e1f..7dbaac980d1 100644
--- a/sys/compat/hpux/hpux_syscallargs.h
+++ b/sys/compat/hpux/hpux_syscallargs.h
@@ -1,8 +1,10 @@
+/*	$OpenBSD: hpux_syscallargs.h,v 1.7 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1997/03/26 08:11:09 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:46 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -422,7 +424,7 @@ int	hpux_sys_stat	__P((struct proc *, void *, register_t *));
 int	hpux_sys_setpgrp_6x	__P((struct proc *, void *, register_t *));
 int	hpux_sys_lstat	__P((struct proc *, void *, register_t *));
 int	hpux_sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	hpux_sys_times_6x	__P((struct proc *, void *, register_t *));
 int	sys_profil	__P((struct proc *, void *, register_t *));
 int	sys_setgid	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/hpux/hpux_syscalls.c b/sys/compat/hpux/hpux_syscalls.c
index f8f0c1f4e0f..83c0db1c9ff 100644
--- a/sys/compat/hpux/hpux_syscalls.c
+++ b/sys/compat/hpux/hpux_syscalls.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: hpux_syscalls.c,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1997/03/26 08:11:09 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:46 deraadt Exp 
  */
 
 char *hpux_syscallnames[] = {
@@ -48,7 +50,7 @@ char *hpux_syscallnames[] = {
 	"setpgrp_6x",			/* 39 = setpgrp_6x */
 	"lstat",			/* 40 = lstat */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"times_6x",			/* 43 = times_6x */
 	"profil",			/* 44 = profil */
 	"#45 (unimplemented ki_syscall)",		/* 45 = unimplemented ki_syscall */
diff --git a/sys/compat/hpux/hpux_sysent.c b/sys/compat/hpux/hpux_sysent.c
index e084215bc6b..da057c2d005 100644
--- a/sys/compat/hpux/hpux_sysent.c
+++ b/sys/compat/hpux/hpux_sysent.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: hpux_sysent.c,v 1.7 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1997/03/26 08:11:09 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:46 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -103,7 +105,7 @@ struct sysent hpux_sysent[] = {
 	{ 1, s(struct hpux_sys_dup_args),
 	    hpux_sys_dup },			/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 1, s(struct hpux_sys_times_6x_args),
 	    hpux_sys_times_6x },		/* 43 = times_6x */
 	{ 4, s(struct sys_profil_args),
diff --git a/sys/compat/ibcs2/ibcs2_syscall.h b/sys/compat/ibcs2/ibcs2_syscall.h
index a6026714475..396b0628f6a 100644
--- a/sys/compat/ibcs2/ibcs2_syscall.h
+++ b/sys/compat/ibcs2/ibcs2_syscall.h
@@ -1,66 +1,180 @@
+/*	$OpenBSD: ibcs2_syscall.h,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1996/08/02 21:55:17 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:47 deraadt Exp 
  */
 
+/* syscall: "syscall" ret: "int" args: */
 #define	IBCS2_SYS_syscall	0
+
+/* syscall: "exit" ret: "int" args: "int" */
 #define	IBCS2_SYS_exit	1
+
+/* syscall: "fork" ret: "int" args: */
 #define	IBCS2_SYS_fork	2
+
+/* syscall: "read" ret: "int" args: "int" "char *" "u_int" */
 #define	IBCS2_SYS_read	3
+
+/* syscall: "write" ret: "int" args: "int" "char *" "u_int" */
 #define	IBCS2_SYS_write	4
+
+/* syscall: "open" ret: "int" args: "char *" "int" "int" */
 #define	IBCS2_SYS_open	5
+
+/* syscall: "close" ret: "int" args: "int" */
 #define	IBCS2_SYS_close	6
+
+/* syscall: "waitsys" ret: "int" args: "int" "int" "int" */
 #define	IBCS2_SYS_waitsys	7
+
+/* syscall: "creat" ret: "int" args: "char *" "int" */
 #define	IBCS2_SYS_creat	8
+
+/* syscall: "link" ret: "int" args: "char *" "char *" */
 #define	IBCS2_SYS_link	9
+
+/* syscall: "unlink" ret: "int" args: "char *" */
 #define	IBCS2_SYS_unlink	10
+
+/* syscall: "execv" ret: "int" args: "char *" "char **" */
 #define	IBCS2_SYS_execv	11
+
+/* syscall: "chdir" ret: "int" args: "char *" */
 #define	IBCS2_SYS_chdir	12
+
+/* syscall: "time" ret: "int" args: "ibcs2_time_t *" */
 #define	IBCS2_SYS_time	13
+
+/* syscall: "mknod" ret: "int" args: "char *" "int" "int" */
 #define	IBCS2_SYS_mknod	14
+
+/* syscall: "chmod" ret: "int" args: "char *" "int" */
 #define	IBCS2_SYS_chmod	15
+
+/* syscall: "chown" ret: "int" args: "char *" "int" "int" */
 #define	IBCS2_SYS_chown	16
+
+/* syscall: "obreak" ret: "int" args: "caddr_t" */
 #define	IBCS2_SYS_obreak	17
+
+/* syscall: "stat" ret: "int" args: "char *" "struct ibcs2_stat *" */
 #define	IBCS2_SYS_stat	18
+
+/* syscall: "lseek" ret: "long" args: "int" "long" "int" */
 #define	IBCS2_SYS_lseek	19
+
+/* syscall: "getpid" ret: "pid_t" args: */
 #define	IBCS2_SYS_getpid	20
+
+/* syscall: "mount" ret: "int" args: "char *" "char *" "int" "int" "char *" "int" */
 #define	IBCS2_SYS_mount	21
+
+/* syscall: "umount" ret: "int" args: "char *" */
 #define	IBCS2_SYS_umount	22
+
+/* syscall: "setuid" ret: "int" args: "int" */
 #define	IBCS2_SYS_setuid	23
+
+/* syscall: "getuid" ret: "uid_t" args: */
 #define	IBCS2_SYS_getuid	24
+
+/* syscall: "stime" ret: "int" args: "long *" */
 #define	IBCS2_SYS_stime	25
+
+/* syscall: "alarm" ret: "int" args: "unsigned" */
 #define	IBCS2_SYS_alarm	27
+
+/* syscall: "fstat" ret: "int" args: "int" "struct ibcs2_stat *" */
 #define	IBCS2_SYS_fstat	28
+
+/* syscall: "pause" ret: "int" args: */
 #define	IBCS2_SYS_pause	29
+
+/* syscall: "utime" ret: "int" args: "char *" "struct ibcs2_utimbuf *" */
 #define	IBCS2_SYS_utime	30
+
+/* syscall: "access" ret: "int" args: "char *" "int" */
 #define	IBCS2_SYS_access	33
+
+/* syscall: "nice" ret: "int" args: "int" */
 #define	IBCS2_SYS_nice	34
+
+/* syscall: "statfs" ret: "int" args: "char *" "struct ibcs2_statfs *" "int" "int" */
 #define	IBCS2_SYS_statfs	35
+
+/* syscall: "sync" ret: "int" args: */
 #define	IBCS2_SYS_sync	36
+
+/* syscall: "kill" ret: "int" args: "int" "int" */
 #define	IBCS2_SYS_kill	37
+
+/* syscall: "fstatfs" ret: "int" args: "int" "struct ibcs2_statfs *" "int" "int" */
 #define	IBCS2_SYS_fstatfs	38
+
+/* syscall: "pgrpsys" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	IBCS2_SYS_pgrpsys	39
+
+/* syscall: "dup" ret: "int" args: "u_int" */
 #define	IBCS2_SYS_dup	41
-#define	IBCS2_SYS_pipe	42
+
+/* syscall: "opipe" ret: "int" args: */
+#define	IBCS2_SYS_opipe	42
+
+/* syscall: "times" ret: "int" args: "struct tms *" */
 #define	IBCS2_SYS_times	43
+
+/* syscall: "plock" ret: "int" args: "int" */
 #define	IBCS2_SYS_plock	45
+
+/* syscall: "setgid" ret: "int" args: "int" */
 #define	IBCS2_SYS_setgid	46
+
+/* syscall: "getgid" ret: "gid_t" args: */
 #define	IBCS2_SYS_getgid	47
+
+/* syscall: "sigsys" ret: "int" args: "int" "ibcs2_sig_t" */
 #define	IBCS2_SYS_sigsys	48
+
+/* syscall: "msgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
 #define	IBCS2_SYS_msgsys	49
+
+/* syscall: "sysi86" ret: "int" args: "int" "int" */
 #define	IBCS2_SYS_sysi86	50
+
+/* syscall: "shmsys" ret: "int" args: "int" "int" "int" "int" */
 #define	IBCS2_SYS_shmsys	52
+
+/* syscall: "semsys" ret: "int" args: "int" "int" "int" "int" "int" */
 #define	IBCS2_SYS_semsys	53
+
+/* syscall: "ioctl" ret: "int" args: "int" "int" "caddr_t" */
 #define	IBCS2_SYS_ioctl	54
+
+/* syscall: "uadmin" ret: "int" args: "int" "int" "caddr_t" */
 #define	IBCS2_SYS_uadmin	55
+
+/* syscall: "utssys" ret: "int" args: "int" "int" "int" */
 #define	IBCS2_SYS_utssys	57
+
+/* syscall: "execve" ret: "int" args: "char *" "char **" "char **" */
 #define	IBCS2_SYS_execve	59
+
+/* syscall: "umask" ret: "int" args: "int" */
 #define	IBCS2_SYS_umask	60
+
+/* syscall: "chroot" ret: "int" args: "char *" */
 #define	IBCS2_SYS_chroot	61
+
+/* syscall: "fcntl" ret: "int" args: "int" "int" "char *" */
 #define	IBCS2_SYS_fcntl	62
+
+/* syscall: "ulimit" ret: "long" args: "int" "int" */
 #define	IBCS2_SYS_ulimit	63
+
 				/* 70 is obsolete rfs_advfs */
 				/* 71 is obsolete rfs_unadvfs */
 				/* 72 is obsolete rfs_rmount */
@@ -69,31 +183,85 @@
 				/* 75 is obsolete rfs_sigret */
 				/* 76 is obsolete rfs_rdebug */
 				/* 77 is obsolete rfs_rfstop */
+/* syscall: "rmdir" ret: "int" args: "char *" */
 #define	IBCS2_SYS_rmdir	79
+
+/* syscall: "mkdir" ret: "int" args: "char *" "int" */
 #define	IBCS2_SYS_mkdir	80
+
+/* syscall: "getdents" ret: "int" args: "int" "char *" "int" */
 #define	IBCS2_SYS_getdents	81
+
+/* syscall: "sysfs" ret: "int" args: "int" "caddr_t" "char *" */
 #define	IBCS2_SYS_sysfs	84
+
+/* syscall: "getmsg" ret: "int" args: "int" "struct ibcs2_stropts *" "struct ibcs2_stropts *" "int *" */
 #define	IBCS2_SYS_getmsg	85
+
+/* syscall: "putmsg" ret: "int" args: "int" "struct ibcs2_stropts *" "struct ibcs2_stropts *" "int" */
 #define	IBCS2_SYS_putmsg	86
+
+/* syscall: "poll" ret: "int" args: "struct pollfd *" "u_long" "int" */
 #define	IBCS2_SYS_poll	87
+
+/* syscall: "symlink" ret: "int" args: "char *" "char *" */
 #define	IBCS2_SYS_symlink	90
+
+/* syscall: "lstat" ret: "int" args: "char *" "struct ibcs2_stat *" */
 #define	IBCS2_SYS_lstat	91
+
+/* syscall: "readlink" ret: "int" args: "char *" "char *" "int" */
 #define	IBCS2_SYS_readlink	92
+
+/* syscall: "sigreturn" ret: "int" args: "struct sigcontext *" */
 #define	IBCS2_SYS_sigreturn	103
+
+/* syscall: "rdchk" ret: "int" args: "int" */
 #define	IBCS2_SYS_rdchk	135
+
+/* syscall: "chsize" ret: "int" args: "int" "long" */
 #define	IBCS2_SYS_chsize	138
+
+/* syscall: "ftime" ret: "int" args: "struct xenix_timeb *" */
 #define	IBCS2_SYS_ftime	139
+
+/* syscall: "nap" ret: "int" args: "int" */
 #define	IBCS2_SYS_nap	140
+
+/* syscall: "select" ret: "int" args: "u_int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
 #define	IBCS2_SYS_select	164
+
+/* syscall: "eaccess" ret: "int" args: "char *" "int" */
 #define	IBCS2_SYS_eaccess	165
+
+/* syscall: "sigaction" ret: "int" args: "int" "struct ibcs2_sigaction *" "struct ibcs2_sigaction *" */
 #define	IBCS2_SYS_sigaction	167
+
+/* syscall: "sigprocmask" ret: "int" args: "int" "ibcs2_sigset_t *" "ibcs2_sigset_t *" */
 #define	IBCS2_SYS_sigprocmask	168
+
+/* syscall: "sigpending" ret: "int" args: "ibcs2_sigset_t *" */
 #define	IBCS2_SYS_sigpending	169
+
+/* syscall: "sigsuspend" ret: "int" args: "ibcs2_sigset_t *" */
 #define	IBCS2_SYS_sigsuspend	170
+
+/* syscall: "getgroups" ret: "int" args: "int" "ibcs2_gid_t *" */
 #define	IBCS2_SYS_getgroups	171
+
+/* syscall: "setgroups" ret: "int" args: "int" "ibcs2_gid_t *" */
 #define	IBCS2_SYS_setgroups	172
+
+/* syscall: "sysconf" ret: "int" args: "int" */
 #define	IBCS2_SYS_sysconf	173
+
+/* syscall: "pathconf" ret: "int" args: "char *" "int" */
 #define	IBCS2_SYS_pathconf	174
+
+/* syscall: "fpathconf" ret: "int" args: "int" "int" */
 #define	IBCS2_SYS_fpathconf	175
+
+/* syscall: "rename" ret: "int" args: "char *" "char *" */
 #define	IBCS2_SYS_rename	176
+
 #define	IBCS2_SYS_MAXSYSCALL	177
diff --git a/sys/compat/ibcs2/ibcs2_syscallargs.h b/sys/compat/ibcs2/ibcs2_syscallargs.h
index a704ee2a6e4..1446b718d1c 100644
--- a/sys/compat/ibcs2/ibcs2_syscallargs.h
+++ b/sys/compat/ibcs2/ibcs2_syscallargs.h
@@ -1,8 +1,10 @@
+/*	$OpenBSD: ibcs2_syscallargs.h,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1996/08/02 21:55:17 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:47 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -384,7 +386,7 @@ int	ibcs2_sys_kill	__P((struct proc *, void *, register_t *));
 int	ibcs2_sys_fstatfs	__P((struct proc *, void *, register_t *));
 int	ibcs2_sys_pgrpsys	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	ibcs2_sys_times	__P((struct proc *, void *, register_t *));
 int	ibcs2_sys_plock	__P((struct proc *, void *, register_t *));
 int	ibcs2_sys_setgid	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/ibcs2/ibcs2_syscalls.c b/sys/compat/ibcs2/ibcs2_syscalls.c
index 9f6ed193239..9b441f58616 100644
--- a/sys/compat/ibcs2/ibcs2_syscalls.c
+++ b/sys/compat/ibcs2/ibcs2_syscalls.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: ibcs2_syscalls.c,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1996/08/02 21:55:17 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:47 deraadt Exp 
  */
 
 char *ibcs2_syscallnames[] = {
@@ -48,7 +50,7 @@ char *ibcs2_syscallnames[] = {
 	"pgrpsys",			/* 39 = pgrpsys */
 	"#40 (unimplemented ibcs2_xenix)",		/* 40 = unimplemented ibcs2_xenix */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"times",			/* 43 = times */
 	"#44 (unimplemented profil)",		/* 44 = unimplemented profil */
 	"plock",			/* 45 = plock */
diff --git a/sys/compat/ibcs2/ibcs2_sysent.c b/sys/compat/ibcs2/ibcs2_sysent.c
index 3dc93315898..9858231d986 100644
--- a/sys/compat/ibcs2/ibcs2_sysent.c
+++ b/sys/compat/ibcs2/ibcs2_sysent.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: ibcs2_sysent.c,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
+
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1996/08/02 21:55:17 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:47 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -122,7 +124,7 @@ struct sysent ibcs2_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 1, s(struct ibcs2_sys_times_args),
 	    ibcs2_sys_times },			/* 43 = times */
 	{ 0, 0,
diff --git a/sys/compat/osf1/osf1_syscall.h b/sys/compat/osf1/osf1_syscall.h
index 9df9a2c33ca..13299a474a6 100644
--- a/sys/compat/osf1/osf1_syscall.h
+++ b/sys/compat/osf1/osf1_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: osf1_syscall.h,v 1.5 1998/02/17 02:08:10 millert Exp $	*/
+/*	$OpenBSD: osf1_syscall.h,v 1.6 1999/06/07 07:18:35 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1998/02/17 01:48:07 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:47 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -88,8 +88,8 @@
 /* syscall: "dup" ret: "int" args: "u_int" */
 #define	OSF1_SYS_dup	41
 
-/* syscall: "pipe" ret: "int" args: */
-#define	OSF1_SYS_pipe	42
+/* syscall: "opipe" ret: "int" args: */
+#define	OSF1_SYS_opipe	42
 
 /* syscall: "open" ret: "int" args: "char *" "int" "int" */
 #define	OSF1_SYS_open	45
diff --git a/sys/compat/osf1/osf1_syscallargs.h b/sys/compat/osf1/osf1_syscallargs.h
index f8a1c5c80a1..edf8a1fe458 100644
--- a/sys/compat/osf1/osf1_syscallargs.h
+++ b/sys/compat/osf1/osf1_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: osf1_syscallargs.h,v 1.5 1998/02/17 02:08:10 millert Exp $	*/
+/*	$OpenBSD: osf1_syscallargs.h,v 1.6 1999/06/07 07:18:36 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1998/02/17 01:48:07 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:47 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -223,7 +223,7 @@ int	sys_sync	__P((struct proc *, void *, register_t *));
 int	sys_kill	__P((struct proc *, void *, register_t *));
 int	sys_setpgid	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	osf1_sys_open	__P((struct proc *, void *, register_t *));
 int	sys_getgid	__P((struct proc *, void *, register_t *));
 int	sys_sigprocmask	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/osf1/osf1_syscalls.c b/sys/compat/osf1/osf1_syscalls.c
index 2df56f3c28a..81b5a7c6cf3 100644
--- a/sys/compat/osf1/osf1_syscalls.c
+++ b/sys/compat/osf1/osf1_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: osf1_syscalls.c,v 1.5 1998/02/17 02:08:09 millert Exp $	*/
+/*	$OpenBSD: osf1_syscalls.c,v 1.6 1999/06/07 07:18:36 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1998/02/17 01:48:07 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:47 deraadt Exp 
  */
 
 char *osf1_syscallnames[] = {
@@ -50,7 +50,7 @@ char *osf1_syscallnames[] = {
 	"setpgid",			/* 39 = setpgid */
 	"#40 (unimplemented old lstat)",		/* 40 = unimplemented old lstat */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"#43 (unimplemented set_program_attributes)",		/* 43 = unimplemented set_program_attributes */
 	"#44 (unimplemented profil)",		/* 44 = unimplemented profil */
 	"open",			/* 45 = open */
diff --git a/sys/compat/osf1/osf1_sysent.c b/sys/compat/osf1/osf1_sysent.c
index 70e72d93392..6a37333df2f 100644
--- a/sys/compat/osf1/osf1_sysent.c
+++ b/sys/compat/osf1/osf1_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: osf1_sysent.c,v 1.5 1998/02/17 02:08:09 millert Exp $	*/
+/*	$OpenBSD: osf1_sysent.c,v 1.6 1999/06/07 07:18:36 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.5 1998/02/17 01:48:07 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.6 1999/06/07 07:17:47 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -103,7 +103,7 @@ struct sysent osf1_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 0, 0,
 	    sys_nosys },			/* 43 = unimplemented set_program_attributes */
 	{ 0, 0,
diff --git a/sys/compat/sunos/sunos_syscall.h b/sys/compat/sunos/sunos_syscall.h
index df6598e9cf9..bbf85535c61 100644
--- a/sys/compat/sunos/sunos_syscall.h
+++ b/sys/compat/sunos/sunos_syscall.h
@@ -1,159 +1,449 @@
+/*	$OpenBSD: sunos_syscall.h,v 1.11 1999/06/07 07:18:36 deraadt Exp $	*/
+
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1998/03/23 07:12:40 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:48 deraadt Exp 
  */
 
+/* syscall: "syscall" ret: "int" args: */
 #define	SUNOS_SYS_syscall	0
+
+/* syscall: "exit" ret: "int" args: "int" */
 #define	SUNOS_SYS_exit	1
+
+/* syscall: "fork" ret: "int" args: */
 #define	SUNOS_SYS_fork	2
+
+/* syscall: "read" ret: "int" args: "int" "char *" "u_int" */
 #define	SUNOS_SYS_read	3
+
+/* syscall: "write" ret: "int" args: "int" "char *" "u_int" */
 #define	SUNOS_SYS_write	4
+
+/* syscall: "open" ret: "int" args: "char *" "int" "int" */
 #define	SUNOS_SYS_open	5
+
+/* syscall: "close" ret: "int" args: "int" */
 #define	SUNOS_SYS_close	6
+
+/* syscall: "wait4" ret: "int" args: "int" "int *" "int" "struct rusage *" */
 #define	SUNOS_SYS_wait4	7
+
+/* syscall: "creat" ret: "int" args: "char *" "int" */
 #define	SUNOS_SYS_creat	8
+
+/* syscall: "link" ret: "int" args: "char *" "char *" */
 #define	SUNOS_SYS_link	9
+
+/* syscall: "unlink" ret: "int" args: "char *" */
 #define	SUNOS_SYS_unlink	10
+
+/* syscall: "execv" ret: "int" args: "char *" "char **" */
 #define	SUNOS_SYS_execv	11
+
+/* syscall: "chdir" ret: "int" args: "char *" */
 #define	SUNOS_SYS_chdir	12
+
 				/* 13 is obsolete time */
+/* syscall: "mknod" ret: "int" args: "char *" "int" "int" */
 #define	SUNOS_SYS_mknod	14
+
+/* syscall: "chmod" ret: "int" args: "char *" "int" */
 #define	SUNOS_SYS_chmod	15
+
+/* syscall: "lchown" ret: "int" args: "char *" "int" "int" */
 #define	SUNOS_SYS_lchown	16
+
+/* syscall: "break" ret: "int" args: "char *" */
 #define	SUNOS_SYS_break	17
+
 				/* 18 is obsolete stat */
+/* syscall: "lseek" ret: "long" args: "int" "long" "int" */
 #define	SUNOS_SYS_lseek	19
+
+/* syscall: "getpid" ret: "pid_t" args: */
 #define	SUNOS_SYS_getpid	20
+
 				/* 21 is obsolete sunos_old_mount */
+/* syscall: "setuid" ret: "int" args: "uid_t" */
 #define	SUNOS_SYS_setuid	23
+
+/* syscall: "getuid" ret: "uid_t" args: */
 #define	SUNOS_SYS_getuid	24
+
+/* syscall: "ostime" ret: "int" args: "int" */
 #define	SUNOS_SYS_ostime	25
+
+/* syscall: "ptrace" ret: "long" args: "int" "pid_t" "caddr_t" "int" "char *" */
 #define	SUNOS_SYS_ptrace	26
+
+/* syscall: "access" ret: "int" args: "char *" "int" */
 #define	SUNOS_SYS_access	33
+
+/* syscall: "sync" ret: "int" args: */
 #define	SUNOS_SYS_sync	36
+
+/* syscall: "kill" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_kill	37
+
+/* syscall: "stat" ret: "int" args: "char *" "struct ostat *" */
 #define	SUNOS_SYS_stat	38
+
+/* syscall: "lstat" ret: "int" args: "char *" "struct ostat *" */
 #define	SUNOS_SYS_lstat	40
+
+/* syscall: "dup" ret: "int" args: "u_int" */
 #define	SUNOS_SYS_dup	41
-#define	SUNOS_SYS_pipe	42
+
+/* syscall: "opipe" ret: "int" args: */
+#define	SUNOS_SYS_opipe	42
+
+/* syscall: "otimes" ret: "int" args: "struct tms *" */
 #define	SUNOS_SYS_otimes	43
+
+/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */
 #define	SUNOS_SYS_profil	44
+
+/* syscall: "setgid" ret: "int" args: "uid_t" */
 #define	SUNOS_SYS_setgid	46
+
+/* syscall: "getgid" ret: "gid_t" args: */
 #define	SUNOS_SYS_getgid	47
+
+/* syscall: "acct" ret: "int" args: "char *" */
 #define	SUNOS_SYS_acct	51
+
+/* syscall: "mctl" ret: "int" args: "caddr_t" "int" "int" "void *" */
 #define	SUNOS_SYS_mctl	53
+
+/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */
 #define	SUNOS_SYS_ioctl	54
+
+/* syscall: "reboot" ret: "int" args: "int" "char *" */
 #define	SUNOS_SYS_reboot	55
+
 				/* 56 is obsolete sunos_owait3 */
+/* syscall: "symlink" ret: "int" args: "char *" "char *" */
 #define	SUNOS_SYS_symlink	57
+
+/* syscall: "readlink" ret: "int" args: "char *" "char *" "int" */
 #define	SUNOS_SYS_readlink	58
+
+/* syscall: "execve" ret: "int" args: "char *" "char **" "char **" */
 #define	SUNOS_SYS_execve	59
+
+/* syscall: "umask" ret: "int" args: "int" */
 #define	SUNOS_SYS_umask	60
+
+/* syscall: "chroot" ret: "int" args: "char *" */
 #define	SUNOS_SYS_chroot	61
+
+/* syscall: "fstat" ret: "int" args: "int" "struct ostat *" */
 #define	SUNOS_SYS_fstat	62
+
+/* syscall: "getpagesize" ret: "int" args: */
 #define	SUNOS_SYS_getpagesize	64
+
+/* syscall: "msync" ret: "int" args: "void *" "size_t" "int" */
 #define	SUNOS_SYS_msync	65
+
+/* syscall: "vfork" ret: "int" args: */
 #define	SUNOS_SYS_vfork	66
+
 				/* 67 is obsolete vread */
 				/* 68 is obsolete vwrite */
+/* syscall: "sbrk" ret: "int" args: "int" */
 #define	SUNOS_SYS_sbrk	69
+
+/* syscall: "sstk" ret: "int" args: "int" */
 #define	SUNOS_SYS_sstk	70
+
+/* syscall: "mmap" ret: "int" args: "caddr_t" "size_t" "int" "int" "int" "long" */
 #define	SUNOS_SYS_mmap	71
+
+/* syscall: "vadvise" ret: "int" args: "int" */
 #define	SUNOS_SYS_vadvise	72
+
+/* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	SUNOS_SYS_munmap	73
+
+/* syscall: "mprotect" ret: "int" args: "caddr_t" "size_t" "int" */
 #define	SUNOS_SYS_mprotect	74
+
+/* syscall: "madvise" ret: "int" args: "caddr_t" "size_t" "int" */
 #define	SUNOS_SYS_madvise	75
+
+/* syscall: "vhangup" ret: "int" args: */
 #define	SUNOS_SYS_vhangup	76
+
+/* syscall: "mincore" ret: "int" args: "caddr_t" "size_t" "char *" */
 #define	SUNOS_SYS_mincore	78
+
+/* syscall: "getgroups" ret: "int" args: "u_int" "gid_t *" */
 #define	SUNOS_SYS_getgroups	79
+
+/* syscall: "setgroups" ret: "int" args: "u_int" "gid_t *" */
 #define	SUNOS_SYS_setgroups	80
+
+/* syscall: "getpgrp" ret: "int" args: */
 #define	SUNOS_SYS_getpgrp	81
+
+/* syscall: "setpgrp" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_setpgrp	82
+
+/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval *" "struct itimerval *" */
 #define	SUNOS_SYS_setitimer	83
+
+/* syscall: "swapon" ret: "int" args: "char *" */
 #define	SUNOS_SYS_swapon	85
+
+/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval *" */
 #define	SUNOS_SYS_getitimer	86
+
+/* syscall: "gethostname" ret: "int" args: "char *" "u_int" */
 #define	SUNOS_SYS_gethostname	87
+
+/* syscall: "sethostname" ret: "int" args: "char *" "u_int" */
 #define	SUNOS_SYS_sethostname	88
+
+/* syscall: "getdtablesize" ret: "int" args: */
 #define	SUNOS_SYS_getdtablesize	89
+
+/* syscall: "dup2" ret: "int" args: "u_int" "u_int" */
 #define	SUNOS_SYS_dup2	90
+
+/* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */
 #define	SUNOS_SYS_fcntl	92
+
+/* syscall: "select" ret: "int" args: "u_int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
 #define	SUNOS_SYS_select	93
+
+/* syscall: "fsync" ret: "int" args: "int" */
 #define	SUNOS_SYS_fsync	95
+
+/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
 #define	SUNOS_SYS_setpriority	96
+
+/* syscall: "socket" ret: "int" args: "int" "int" "int" */
 #define	SUNOS_SYS_socket	97
+
+/* syscall: "connect" ret: "int" args: "int" "caddr_t" "int" */
 #define	SUNOS_SYS_connect	98
+
+/* syscall: "accept" ret: "int" args: "int" "caddr_t" "int *" */
 #define	SUNOS_SYS_accept	99
+
+/* syscall: "getpriority" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_getpriority	100
+
+/* syscall: "send" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	SUNOS_SYS_send	101
+
+/* syscall: "recv" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	SUNOS_SYS_recv	102
+
+/* syscall: "bind" ret: "int" args: "int" "caddr_t" "int" */
 #define	SUNOS_SYS_bind	104
+
+/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int" */
 #define	SUNOS_SYS_setsockopt	105
+
+/* syscall: "listen" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_listen	106
+
+/* syscall: "sigvec" ret: "int" args: "int" "struct sigvec *" "struct sigvec *" */
 #define	SUNOS_SYS_sigvec	108
+
+/* syscall: "sigblock" ret: "int" args: "int" */
 #define	SUNOS_SYS_sigblock	109
+
+/* syscall: "sigsetmask" ret: "int" args: "int" */
 #define	SUNOS_SYS_sigsetmask	110
+
+/* syscall: "sigsuspend" ret: "int" args: "int" */
 #define	SUNOS_SYS_sigsuspend	111
+
+/* syscall: "sigstack" ret: "int" args: "struct sigstack *" "struct sigstack *" */
 #define	SUNOS_SYS_sigstack	112
+
+/* syscall: "recvmsg" ret: "int" args: "int" "struct omsghdr *" "int" */
 #define	SUNOS_SYS_recvmsg	113
+
+/* syscall: "sendmsg" ret: "int" args: "int" "caddr_t" "int" */
 #define	SUNOS_SYS_sendmsg	114
+
 				/* 115 is obsolete vtrace */
+/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
 #define	SUNOS_SYS_gettimeofday	116
+
+/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
 #define	SUNOS_SYS_getrusage	117
+
+/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int *" */
 #define	SUNOS_SYS_getsockopt	118
+
+/* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */
 #define	SUNOS_SYS_readv	120
+
+/* syscall: "writev" ret: "int" args: "int" "struct iovec *" "u_int" */
 #define	SUNOS_SYS_writev	121
+
+/* syscall: "settimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
 #define	SUNOS_SYS_settimeofday	122
+
+/* syscall: "fchown" ret: "int" args: "int" "int" "int" */
 #define	SUNOS_SYS_fchown	123
+
+/* syscall: "fchmod" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_fchmod	124
+
+/* syscall: "recvfrom" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int *" */
 #define	SUNOS_SYS_recvfrom	125
+
+/* syscall: "setreuid" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_setreuid	126
+
+/* syscall: "setregid" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_setregid	127
+
+/* syscall: "rename" ret: "int" args: "char *" "char *" */
 #define	SUNOS_SYS_rename	128
+
+/* syscall: "truncate" ret: "int" args: "char *" "long" */
 #define	SUNOS_SYS_truncate	129
+
+/* syscall: "ftruncate" ret: "int" args: "int" "long" */
 #define	SUNOS_SYS_ftruncate	130
+
+/* syscall: "flock" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_flock	131
+
+/* syscall: "sendto" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int" */
 #define	SUNOS_SYS_sendto	133
+
+/* syscall: "shutdown" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_shutdown	134
+
+/* syscall: "socketpair" ret: "int" args: "int" "int" "int" "int *" */
 #define	SUNOS_SYS_socketpair	135
+
+/* syscall: "mkdir" ret: "int" args: "char *" "int" */
 #define	SUNOS_SYS_mkdir	136
+
+/* syscall: "rmdir" ret: "int" args: "char *" */
 #define	SUNOS_SYS_rmdir	137
+
+/* syscall: "utimes" ret: "int" args: "char *" "struct timeval *" */
 #define	SUNOS_SYS_utimes	138
+
+/* syscall: "sigreturn" ret: "int" args: "struct sigcontext *" */
 #define	SUNOS_SYS_sigreturn	139
+
+/* syscall: "adjtime" ret: "int" args: "struct timeval *" "struct timeval *" */
 #define	SUNOS_SYS_adjtime	140
+
+/* syscall: "getpeername" ret: "int" args: "int" "caddr_t" "int *" */
 #define	SUNOS_SYS_getpeername	141
+
+/* syscall: "gethostid" ret: "int" args: */
 #define	SUNOS_SYS_gethostid	142
+
+/* syscall: "getrlimit" ret: "int" args: "u_int" "struct orlimit *" */
 #define	SUNOS_SYS_getrlimit	144
+
+/* syscall: "setrlimit" ret: "int" args: "u_int" "struct orlimit *" */
 #define	SUNOS_SYS_setrlimit	145
+
+/* syscall: "killpg" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_killpg	146
+
+/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */
 #define	SUNOS_SYS_getsockname	150
+
+/* syscall: "poll" ret: "int" args: "struct pollfd *" "unsigned long" "int" */
 #define	SUNOS_SYS_poll	153
+
+/* syscall: "nfssvc" ret: "int" args: "int" */
 #define	SUNOS_SYS_nfssvc	155
+
+/* syscall: "getdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
 #define	SUNOS_SYS_getdirentries	156
+
+/* syscall: "statfs" ret: "int" args: "char *" "struct sunos_statfs *" */
 #define	SUNOS_SYS_statfs	157
+
+/* syscall: "fstatfs" ret: "int" args: "int" "struct sunos_statfs *" */
 #define	SUNOS_SYS_fstatfs	158
+
+/* syscall: "unmount" ret: "int" args: "char *" */
 #define	SUNOS_SYS_unmount	159
+
+/* syscall: "async_daemon" ret: "int" args: */
 #define	SUNOS_SYS_async_daemon	160
+
+/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
 #define	SUNOS_SYS_getfh	161
+
+/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
 #define	SUNOS_SYS_getdomainname	162
+
+/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
 #define	SUNOS_SYS_setdomainname	163
+
+/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "caddr_t" */
 #define	SUNOS_SYS_quotactl	165
+
+/* syscall: "exportfs" ret: "int" args: "char *" "char *" */
 #define	SUNOS_SYS_exportfs	166
+
+/* syscall: "mount" ret: "int" args: "char *" "char *" "int" "caddr_t" */
 #define	SUNOS_SYS_mount	167
+
+/* syscall: "ustat" ret: "int" args: "int" "struct sunos_ustat *" */
 #define	SUNOS_SYS_ustat	168
+
+/* syscall: "semsys" ret: "int" args: "int" "int" "int" "int" "int" */
 #define	SUNOS_SYS_semsys	169
+
+/* syscall: "msgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
 #define	SUNOS_SYS_msgsys	170
+
+/* syscall: "shmsys" ret: "int" args: "int" "int" "int" "int" */
 #define	SUNOS_SYS_shmsys	171
+
+/* syscall: "auditsys" ret: "int" args: "char *" */
 #define	SUNOS_SYS_auditsys	172
+
+/* syscall: "getdents" ret: "int" args: "int" "char *" "int" */
 #define	SUNOS_SYS_getdents	174
+
+/* syscall: "setsid" ret: "int" args: */
 #define	SUNOS_SYS_setsid	175
+
+/* syscall: "fchdir" ret: "int" args: "int" */
 #define	SUNOS_SYS_fchdir	176
+
+/* syscall: "fchroot" ret: "int" args: "int" */
 #define	SUNOS_SYS_fchroot	177
+
+/* syscall: "sigpending" ret: "int" args: "int *" */
 #define	SUNOS_SYS_sigpending	183
+
+/* syscall: "setpgid" ret: "int" args: "int" "int" */
 #define	SUNOS_SYS_setpgid	185
+
+/* syscall: "pathconf" ret: "long" args: "char *" "int" */
 #define	SUNOS_SYS_pathconf	186
+
+/* syscall: "fpathconf" ret: "long" args: "int" "int" */
 #define	SUNOS_SYS_fpathconf	187
+
+/* syscall: "sysconf" ret: "int" args: "int" */
 #define	SUNOS_SYS_sysconf	188
+
+/* syscall: "uname" ret: "int" args: "struct sunos_utsname *" */
 #define	SUNOS_SYS_uname	189
+
 #define	SUNOS_SYS_MAXSYSCALL	190
diff --git a/sys/compat/sunos/sunos_syscallargs.h b/sys/compat/sunos/sunos_syscallargs.h
index 76e62b5db67..2d200cb090e 100644
--- a/sys/compat/sunos/sunos_syscallargs.h
+++ b/sys/compat/sunos/sunos_syscallargs.h
@@ -1,8 +1,10 @@
+/*	$OpenBSD: sunos_syscallargs.h,v 1.11 1999/06/07 07:18:36 deraadt Exp $	*/
+
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1998/03/23 07:12:40 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:48 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -240,7 +242,7 @@ int	sys_kill	__P((struct proc *, void *, register_t *));
 int	sunos_sys_stat	__P((struct proc *, void *, register_t *));
 int	sunos_sys_lstat	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	sunos_sys_otimes	__P((struct proc *, void *, register_t *));
 int	sys_profil	__P((struct proc *, void *, register_t *));
 int	sys_setgid	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/sunos/sunos_syscalls.c b/sys/compat/sunos/sunos_syscalls.c
index 7a9bd6ac368..e84fbf347d5 100644
--- a/sys/compat/sunos/sunos_syscalls.c
+++ b/sys/compat/sunos/sunos_syscalls.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: sunos_syscalls.c,v 1.11 1999/06/07 07:18:36 deraadt Exp $	*/
+
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1998/03/23 07:12:40 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:48 deraadt Exp 
  */
 
 char *sunos_syscallnames[] = {
@@ -48,7 +50,7 @@ char *sunos_syscallnames[] = {
 	"#39 (unimplemented sunos_setpgrp)",		/* 39 = unimplemented sunos_setpgrp */
 	"lstat",			/* 40 = lstat */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"otimes",			/* 43 = otimes */
 	"profil",			/* 44 = profil */
 	"#45 (unimplemented)",		/* 45 = unimplemented */
diff --git a/sys/compat/sunos/sunos_sysent.c b/sys/compat/sunos/sunos_sysent.c
index 193e05bb45c..2cd0d8d23de 100644
--- a/sys/compat/sunos/sunos_sysent.c
+++ b/sys/compat/sunos/sunos_sysent.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: sunos_sysent.c,v 1.11 1999/06/07 07:18:36 deraadt Exp $	*/
+
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.10 1998/03/23 07:12:40 millert Exp 
+ * created from	OpenBSD: syscalls.master,v 1.11 1999/06/07 07:17:48 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -120,7 +122,7 @@ struct sysent sunos_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 1, s(struct sunos_sys_otimes_args),
 	    sunos_sys_otimes },			/* 43 = otimes */
 	{ 4, s(struct sys_profil_args),
diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index 6ee84092b0d..b59b49167d8 100644
--- a/sys/compat/svr4/svr4_syscall.h
+++ b/sys/compat/svr4/svr4_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: svr4_syscall.h,v 1.24 1998/03/06 22:02:18 niklas Exp $	*/
+/*	$OpenBSD: svr4_syscall.h,v 1.25 1999/06/07 07:18:36 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.23 1998/03/06 21:58:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.24 1999/06/07 07:17:48 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -106,8 +106,8 @@
 /* syscall: "dup" ret: "int" args: "u_int" */
 #define	SVR4_SYS_dup	41
 
-/* syscall: "pipe" ret: "int" args: */
-#define	SVR4_SYS_pipe	42
+/* syscall: "opipe" ret: "int" args: */
+#define	SVR4_SYS_opipe	42
 
 /* syscall: "times" ret: "int" args: "struct tms *" */
 #define	SVR4_SYS_times	43
diff --git a/sys/compat/svr4/svr4_syscallargs.h b/sys/compat/svr4/svr4_syscallargs.h
index 070f45413d3..1972bda163d 100644
--- a/sys/compat/svr4/svr4_syscallargs.h
+++ b/sys/compat/svr4/svr4_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: svr4_syscallargs.h,v 1.24 1998/03/06 22:02:16 niklas Exp $	*/
+/*	$OpenBSD: svr4_syscallargs.h,v 1.25 1999/06/07 07:18:37 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.23 1998/03/06 21:58:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.24 1999/06/07 07:17:48 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -405,7 +405,7 @@ int	sys_sync	__P((struct proc *, void *, register_t *));
 int	svr4_sys_kill	__P((struct proc *, void *, register_t *));
 int	svr4_sys_pgrpsys	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	svr4_sys_times	__P((struct proc *, void *, register_t *));
 int	sys_setgid	__P((struct proc *, void *, register_t *));
 int	sys_getgid	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/svr4/svr4_syscalls.c b/sys/compat/svr4/svr4_syscalls.c
index dbc9bcad426..3e98b687709 100644
--- a/sys/compat/svr4/svr4_syscalls.c
+++ b/sys/compat/svr4/svr4_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: svr4_syscalls.c,v 1.24 1998/03/06 22:02:14 niklas Exp $	*/
+/*	$OpenBSD: svr4_syscalls.c,v 1.25 1999/06/07 07:18:37 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.23 1998/03/06 21:58:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.24 1999/06/07 07:17:48 deraadt Exp 
  */
 
 char *svr4_syscallnames[] = {
@@ -50,7 +50,7 @@ char *svr4_syscallnames[] = {
 	"pgrpsys",			/* 39 = pgrpsys */
 	"#40 (unimplemented xenix)",		/* 40 = unimplemented xenix */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"times",			/* 43 = times */
 	"#44 (unimplemented profil)",		/* 44 = unimplemented profil */
 	"#45 (unimplemented plock)",		/* 45 = unimplemented plock */
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index 4566d34be9c..51587691168 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: svr4_sysent.c,v 1.24 1998/03/06 22:02:11 niklas Exp $	*/
+/*	$OpenBSD: svr4_sysent.c,v 1.25 1999/06/07 07:18:37 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.23 1998/03/06 21:58:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.24 1999/06/07 07:17:48 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -126,7 +126,7 @@ struct sysent svr4_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 1, s(struct svr4_sys_times_args),
 	    svr4_sys_times },			/* 43 = times */
 	{ 0, 0,
diff --git a/sys/compat/ultrix/ultrix_syscall.h b/sys/compat/ultrix/ultrix_syscall.h
index 2ca4cec9099..ccbc99ec374 100644
--- a/sys/compat/ultrix/ultrix_syscall.h
+++ b/sys/compat/ultrix/ultrix_syscall.h
@@ -1,35 +1,81 @@
+/*	$OpenBSD: ultrix_syscall.h,v 1.7 1999/06/07 07:18:37 deraadt Exp $	*/
+
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/01/26 23:52:04 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:48 deraadt Exp 
  */
 
+/* syscall: "syscall" ret: "int" args: */
 #define	ULTRIX_SYS_syscall	0
+
+/* syscall: "exit" ret: "int" args: "int" */
 #define	ULTRIX_SYS_exit	1
+
+/* syscall: "fork" ret: "int" args: */
 #define	ULTRIX_SYS_fork	2
+
+/* syscall: "read" ret: "int" args: "int" "char *" "u_int" */
 #define	ULTRIX_SYS_read	3
+
+/* syscall: "write" ret: "int" args: "int" "char *" "u_int" */
 #define	ULTRIX_SYS_write	4
+
+/* syscall: "open" ret: "int" args: "char *" "int" "int" */
 #define	ULTRIX_SYS_open	5
+
+/* syscall: "close" ret: "int" args: "int" */
 #define	ULTRIX_SYS_close	6
+
+/* syscall: "owait" ret: "int" args: */
 #define	ULTRIX_SYS_owait	7
+
+/* syscall: "creat" ret: "int" args: "char *" "int" */
 #define	ULTRIX_SYS_creat	8
+
+/* syscall: "link" ret: "int" args: "char *" "char *" */
 #define	ULTRIX_SYS_link	9
+
+/* syscall: "unlink" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_unlink	10
+
+/* syscall: "execv" ret: "int" args: "char *" "char **" */
 #define	ULTRIX_SYS_execv	11
+
+/* syscall: "chdir" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_chdir	12
+
 				/* 13 is obsolete time */
+/* syscall: "mknod" ret: "int" args: "char *" "int" "int" */
 #define	ULTRIX_SYS_mknod	14
+
+/* syscall: "chmod" ret: "int" args: "char *" "int" */
 #define	ULTRIX_SYS_chmod	15
+
+/* syscall: "lchown" ret: "int" args: "char *" "int" "int" */
 #define	ULTRIX_SYS_lchown	16
+
+/* syscall: "break" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_break	17
+
 				/* 18 is obsolete stat */
+/* syscall: "lseek" ret: "long" args: "int" "long" "int" */
 #define	ULTRIX_SYS_lseek	19
+
+/* syscall: "getpid" ret: "pid_t" args: */
 #define	ULTRIX_SYS_getpid	20
+
+/* syscall: "mount" ret: "int" args: "char *" "char *" "int" "int" "caddr_t" */
 #define	ULTRIX_SYS_mount	21
+
 				/* 22 is obsolete sysV_unmount */
+/* syscall: "setuid" ret: "int" args: "uid_t" */
 #define	ULTRIX_SYS_setuid	23
+
+/* syscall: "getuid" ret: "uid_t" args: */
 #define	ULTRIX_SYS_getuid	24
+
 				/* 25 is obsolete v7 stime */
 				/* 26 is obsolete v7 ptrace */
 				/* 27 is obsolete v7 alarm */
@@ -38,121 +84,339 @@
 				/* 30 is obsolete v7 utime */
 				/* 31 is obsolete v7 stty */
 				/* 32 is obsolete v7 gtty */
+/* syscall: "access" ret: "int" args: "char *" "int" */
 #define	ULTRIX_SYS_access	33
+
 				/* 34 is obsolete v7 nice */
 				/* 35 is obsolete v7 ftime */
+/* syscall: "sync" ret: "int" args: */
 #define	ULTRIX_SYS_sync	36
+
+/* syscall: "kill" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_kill	37
+
+/* syscall: "ostat" ret: "int" args: "char *" "struct ostat *" */
 #define	ULTRIX_SYS_ostat	38
+
 				/* 39 is obsolete v7 setpgrp */
+/* syscall: "olstat" ret: "int" args: "char *" "struct ostat *" */
 #define	ULTRIX_SYS_olstat	40
+
+/* syscall: "dup" ret: "int" args: "u_int" */
 #define	ULTRIX_SYS_dup	41
-#define	ULTRIX_SYS_pipe	42
+
+/* syscall: "opipe" ret: "int" args: */
+#define	ULTRIX_SYS_opipe	42
+
 				/* 43 is obsolete v7 times */
+/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */
 #define	ULTRIX_SYS_profil	44
+
 				/* 46 is obsolete v7 setgid */
+/* syscall: "getgid" ret: "gid_t" args: */
 #define	ULTRIX_SYS_getgid	47
+
+/* syscall: "acct" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_acct	51
+
+/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */
 #define	ULTRIX_SYS_ioctl	54
+
+/* syscall: "reboot" ret: "int" args: "int" */
 #define	ULTRIX_SYS_reboot	55
+
+/* syscall: "symlink" ret: "int" args: "char *" "char *" */
 #define	ULTRIX_SYS_symlink	57
+
+/* syscall: "readlink" ret: "int" args: "char *" "char *" "int" */
 #define	ULTRIX_SYS_readlink	58
+
+/* syscall: "execve" ret: "int" args: "char *" "char **" "char **" */
 #define	ULTRIX_SYS_execve	59
+
+/* syscall: "umask" ret: "int" args: "int" */
 #define	ULTRIX_SYS_umask	60
+
+/* syscall: "chroot" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_chroot	61
+
+/* syscall: "fstat" ret: "int" args: "int" "struct ostat *" */
 #define	ULTRIX_SYS_fstat	62
+
+/* syscall: "getpagesize" ret: "int" args: */
 #define	ULTRIX_SYS_getpagesize	64
+
+/* syscall: "vfork" ret: "int" args: */
 #define	ULTRIX_SYS_vfork	66
+
 				/* 67 is obsolete vread */
 				/* 68 is obsolete vwrite */
+/* syscall: "sbrk" ret: "int" args: "int" */
 #define	ULTRIX_SYS_sbrk	69
+
+/* syscall: "sstk" ret: "int" args: "int" */
 #define	ULTRIX_SYS_sstk	70
+
+/* syscall: "mmap" ret: "int" args: "caddr_t" "size_t" "int" "u_int" "int" "long" */
 #define	ULTRIX_SYS_mmap	71
+
+/* syscall: "vadvise" ret: "int" args: "int" */
 #define	ULTRIX_SYS_vadvise	72
+
+/* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	ULTRIX_SYS_munmap	73
+
+/* syscall: "mprotect" ret: "int" args: "caddr_t" "size_t" "int" */
 #define	ULTRIX_SYS_mprotect	74
+
+/* syscall: "madvise" ret: "int" args: "caddr_t" "size_t" "int" */
 #define	ULTRIX_SYS_madvise	75
+
+/* syscall: "vhangup" ret: "int" args: */
 #define	ULTRIX_SYS_vhangup	76
+
+/* syscall: "mincore" ret: "int" args: "caddr_t" "int" "char *" */
 #define	ULTRIX_SYS_mincore	78
+
+/* syscall: "getgroups" ret: "int" args: "u_int" "gid_t *" */
 #define	ULTRIX_SYS_getgroups	79
+
+/* syscall: "setgroups" ret: "int" args: "u_int" "gid_t *" */
 #define	ULTRIX_SYS_setgroups	80
+
+/* syscall: "getpgrp" ret: "int" args: */
 #define	ULTRIX_SYS_getpgrp	81
+
+/* syscall: "setpgrp" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_setpgrp	82
+
+/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval *" "struct itimerval *" */
 #define	ULTRIX_SYS_setitimer	83
+
+/* syscall: "wait3" ret: "int" args: "int *" "int" "struct rusage *" */
 #define	ULTRIX_SYS_wait3	84
+
+/* syscall: "swapon" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_swapon	85
+
+/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval *" */
 #define	ULTRIX_SYS_getitimer	86
+
+/* syscall: "gethostname" ret: "int" args: "char *" "u_int" */
 #define	ULTRIX_SYS_gethostname	87
+
+/* syscall: "sethostname" ret: "int" args: "char *" "u_int" */
 #define	ULTRIX_SYS_sethostname	88
+
+/* syscall: "getdtablesize" ret: "int" args: */
 #define	ULTRIX_SYS_getdtablesize	89
+
+/* syscall: "dup2" ret: "int" args: "u_int" "u_int" */
 #define	ULTRIX_SYS_dup2	90
+
+/* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */
 #define	ULTRIX_SYS_fcntl	92
+
+/* syscall: "select" ret: "int" args: "u_int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
 #define	ULTRIX_SYS_select	93
+
+/* syscall: "fsync" ret: "int" args: "int" */
 #define	ULTRIX_SYS_fsync	95
+
+/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
 #define	ULTRIX_SYS_setpriority	96
+
+/* syscall: "socket" ret: "int" args: "int" "int" "int" */
 #define	ULTRIX_SYS_socket	97
+
+/* syscall: "connect" ret: "int" args: "int" "caddr_t" "int" */
 #define	ULTRIX_SYS_connect	98
+
+/* syscall: "accept" ret: "int" args: "int" "caddr_t" "int *" */
 #define	ULTRIX_SYS_accept	99
+
+/* syscall: "getpriority" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_getpriority	100
+
+/* syscall: "send" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	ULTRIX_SYS_send	101
+
+/* syscall: "recv" ret: "int" args: "int" "caddr_t" "int" "int" */
 #define	ULTRIX_SYS_recv	102
+
+/* syscall: "sigreturn" ret: "int" args: "struct sigcontext *" */
 #define	ULTRIX_SYS_sigreturn	103
+
+/* syscall: "bind" ret: "int" args: "int" "caddr_t" "int" */
 #define	ULTRIX_SYS_bind	104
+
+/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int" */
 #define	ULTRIX_SYS_setsockopt	105
+
+/* syscall: "listen" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_listen	106
+
+/* syscall: "sigvec" ret: "int" args: "int" "struct sigvec *" "struct sigvec *" */
 #define	ULTRIX_SYS_sigvec	108
+
+/* syscall: "sigblock" ret: "int" args: "int" */
 #define	ULTRIX_SYS_sigblock	109
+
+/* syscall: "sigsetmask" ret: "int" args: "int" */
 #define	ULTRIX_SYS_sigsetmask	110
+
+/* syscall: "sigsuspend" ret: "int" args: "int" */
 #define	ULTRIX_SYS_sigsuspend	111
+
+/* syscall: "sigstack" ret: "int" args: "struct sigstack *" "struct sigstack *" */
 #define	ULTRIX_SYS_sigstack	112
+
+/* syscall: "recvmsg" ret: "int" args: "int" "struct omsghdr *" "int" */
 #define	ULTRIX_SYS_recvmsg	113
+
+/* syscall: "sendmsg" ret: "int" args: "int" "caddr_t" "int" */
 #define	ULTRIX_SYS_sendmsg	114
+
 				/* 115 is obsolete vtrace */
+/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
 #define	ULTRIX_SYS_gettimeofday	116
+
+/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
 #define	ULTRIX_SYS_getrusage	117
+
+/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int *" */
 #define	ULTRIX_SYS_getsockopt	118
+
+/* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */
 #define	ULTRIX_SYS_readv	120
+
+/* syscall: "writev" ret: "int" args: "int" "struct iovec *" "u_int" */
 #define	ULTRIX_SYS_writev	121
+
+/* syscall: "settimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
 #define	ULTRIX_SYS_settimeofday	122
+
+/* syscall: "fchown" ret: "int" args: "int" "int" "int" */
 #define	ULTRIX_SYS_fchown	123
+
+/* syscall: "fchmod" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_fchmod	124
+
+/* syscall: "recvfrom" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int *" */
 #define	ULTRIX_SYS_recvfrom	125
+
+/* syscall: "setreuid" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_setreuid	126
+
+/* syscall: "setregid" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_setregid	127
+
+/* syscall: "rename" ret: "int" args: "char *" "char *" */
 #define	ULTRIX_SYS_rename	128
+
+/* syscall: "truncate" ret: "int" args: "char *" "long" */
 #define	ULTRIX_SYS_truncate	129
+
+/* syscall: "ftruncate" ret: "int" args: "int" "long" */
 #define	ULTRIX_SYS_ftruncate	130
+
+/* syscall: "flock" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_flock	131
+
+/* syscall: "sendto" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int" */
 #define	ULTRIX_SYS_sendto	133
+
+/* syscall: "shutdown" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_shutdown	134
+
+/* syscall: "socketpair" ret: "int" args: "int" "int" "int" "int *" */
 #define	ULTRIX_SYS_socketpair	135
+
+/* syscall: "mkdir" ret: "int" args: "char *" "int" */
 #define	ULTRIX_SYS_mkdir	136
+
+/* syscall: "rmdir" ret: "int" args: "char *" */
 #define	ULTRIX_SYS_rmdir	137
+
+/* syscall: "utimes" ret: "int" args: "char *" "struct timeval *" */
 #define	ULTRIX_SYS_utimes	138
+
+/* syscall: "sigcleanup" ret: "int" args: "struct sigcontext *" */
 #define	ULTRIX_SYS_sigcleanup	139
+
+/* syscall: "adjtime" ret: "int" args: "struct timeval *" "struct timeval *" */
 #define	ULTRIX_SYS_adjtime	140
+
+/* syscall: "getpeername" ret: "int" args: "int" "caddr_t" "int *" */
 #define	ULTRIX_SYS_getpeername	141
+
+/* syscall: "gethostid" ret: "int" args: */
 #define	ULTRIX_SYS_gethostid	142
+
+/* syscall: "getrlimit" ret: "int" args: "u_int" "struct orlimit *" */
 #define	ULTRIX_SYS_getrlimit	144
+
+/* syscall: "setrlimit" ret: "int" args: "u_int" "struct orlimit *" */
 #define	ULTRIX_SYS_setrlimit	145
+
+/* syscall: "killpg" ret: "int" args: "int" "int" */
 #define	ULTRIX_SYS_killpg	146
+
+/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */
 #define	ULTRIX_SYS_getsockname	150
+
+/* syscall: "nfssvc" ret: "int" args: "int" */
 #define	ULTRIX_SYS_nfssvc	158
+
+/* syscall: "getdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
 #define	ULTRIX_SYS_getdirentries	159
+
+/* syscall: "statfs" ret: "int" args: "char *" "struct ultrix_statfs *" */
 #define	ULTRIX_SYS_statfs	160
+
+/* syscall: "fstatfs" ret: "int" args: "int" "struct ultrix_statfs *" */
 #define	ULTRIX_SYS_fstatfs	161
+
+/* syscall: "async_daemon" ret: "int" args: */
 #define	ULTRIX_SYS_async_daemon	163
+
+/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
 #define	ULTRIX_SYS_getfh	164
+
+/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
 #define	ULTRIX_SYS_getdomainname	165
+
+/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
 #define	ULTRIX_SYS_setdomainname	166
+
+/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "caddr_t" */
 #define	ULTRIX_SYS_quotactl	168
+
+/* syscall: "exportfs" ret: "int" args: "char *" "char *" */
 #define	ULTRIX_SYS_exportfs	169
+
+/* syscall: "uname" ret: "int" args: "struct ultrix_utsname *" */
 #define	ULTRIX_SYS_uname	179
+
+/* syscall: "ustat" ret: "int" args: "int" "struct ultrix_ustat *" */
 #define	ULTRIX_SYS_ustat	183
+
+/* syscall: "getmnt" ret: "int" args: "int *" "struct ultrix_fs_data *" "int" "int" "char *" */
 #define	ULTRIX_SYS_getmnt	184
+
+/* syscall: "sigpending" ret: "int" args: "int *" */
 #define	ULTRIX_SYS_sigpending	187
+
+/* syscall: "setsid" ret: "int" args: */
 #define	ULTRIX_SYS_setsid	188
+
+/* syscall: "waitpid" ret: "int" args: "int" "int *" "int" */
 #define	ULTRIX_SYS_waitpid	189
+
+/* syscall: "getsysinfo" ret: "int" args: "unsigned" "char *" "unsigned" "int *" "char *" */
 #define	ULTRIX_SYS_getsysinfo	256
+
+/* syscall: "setsysinfo" ret: "int" args: "unsigned" "char *" "unsigned" "unsigned" "unsigned" */
 #define	ULTRIX_SYS_setsysinfo	257
+
 #define	ULTRIX_SYS_MAXSYSCALL	258
diff --git a/sys/compat/ultrix/ultrix_syscallargs.h b/sys/compat/ultrix/ultrix_syscallargs.h
index 4e11eed4a8a..4e1c942961e 100644
--- a/sys/compat/ultrix/ultrix_syscallargs.h
+++ b/sys/compat/ultrix/ultrix_syscallargs.h
@@ -1,8 +1,10 @@
+/*	$OpenBSD: ultrix_syscallargs.h,v 1.7 1999/06/07 07:18:37 deraadt Exp $	*/
+
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/01/26 23:52:04 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:48 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -205,7 +207,7 @@ int	sys_kill	__P((struct proc *, void *, register_t *));
 int	ultrix_sys_stat	__P((struct proc *, void *, register_t *));
 int	ultrix_sys_lstat	__P((struct proc *, void *, register_t *));
 int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
+int	sys_opipe	__P((struct proc *, void *, register_t *));
 int	sys_profil	__P((struct proc *, void *, register_t *));
 int	sys_getgid	__P((struct proc *, void *, register_t *));
 int	sys_acct	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/ultrix/ultrix_syscalls.c b/sys/compat/ultrix/ultrix_syscalls.c
index 4d35997b8f5..097571b0511 100644
--- a/sys/compat/ultrix/ultrix_syscalls.c
+++ b/sys/compat/ultrix/ultrix_syscalls.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: ultrix_syscalls.c,v 1.7 1999/06/07 07:18:37 deraadt Exp $	*/
+
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/01/26 23:52:04 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:48 deraadt Exp 
  */
 
 char *ultrix_syscallnames[] = {
@@ -48,7 +50,7 @@ char *ultrix_syscallnames[] = {
 	"#39 (obsolete v7 setpgrp)",		/* 39 = obsolete v7 setpgrp */
 	"olstat",			/* 40 = olstat */
 	"dup",			/* 41 = dup */
-	"pipe",			/* 42 = pipe */
+	"opipe",			/* 42 = opipe */
 	"#43 (obsolete v7 times)",		/* 43 = obsolete v7 times */
 	"profil",			/* 44 = profil */
 	"#45 (unimplemented)",		/* 45 = unimplemented */
diff --git a/sys/compat/ultrix/ultrix_sysent.c b/sys/compat/ultrix/ultrix_sysent.c
index c577c7a44fa..0d26cdf18ce 100644
--- a/sys/compat/ultrix/ultrix_sysent.c
+++ b/sys/compat/ultrix/ultrix_sysent.c
@@ -1,8 +1,10 @@
+/*	$OpenBSD: ultrix_sysent.c,v 1.7 1999/06/07 07:18:37 deraadt Exp $	*/
+
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/01/26 23:52:04 downsj Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:48 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -118,7 +120,7 @@ struct sysent ultrix_sysent[] = {
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
-	    sys_pipe },				/* 42 = pipe */
+	    sys_opipe },			/* 42 = opipe */
 	{ 0, 0,
 	    sys_nosys },			/* 43 = obsolete v7 times */
 	{ 4, s(struct sys_profil_args),