sync

16 files changed, 52 insertions, 28 deletions

diff --git a/sys/compat/hpux/hpux_syscall.h b/sys/compat/hpux/hpux_syscall.h
index 210c0bd3253..11fc8e4854f 100644
--- a/sys/compat/hpux/hpux_syscall.h
+++ b/sys/compat/hpux/hpux_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.3 1996/08/02 20:29:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.4 1996/08/25 12:19:51 deraadt Exp 
  */
 
 #define	HPUX_SYS_syscall	0
diff --git a/sys/compat/hpux/hpux_syscallargs.h b/sys/compat/hpux/hpux_syscallargs.h
index 41d03a4556d..f5b087bfa39 100644
--- a/sys/compat/hpux/hpux_syscallargs.h
+++ b/sys/compat/hpux/hpux_syscallargs.h
@@ -2,7 +2,7 @@
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.3 1996/08/02 20:29:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.4 1996/08/25 12:19:51 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -172,6 +172,12 @@ struct hpux_sys_readlink_args {
 	syscallarg(int) count;
 };
 
+struct hpux_sys_execve_args {
+	syscallarg(char *) path;
+	syscallarg(char **) argp;
+	syscallarg(char **) envp;
+};
+
 struct hpux_sys_fcntl_args {
 	syscallarg(int) fd;
 	syscallarg(int) cmd;
@@ -422,7 +428,7 @@ int	hpux_sys_ioctl	__P((struct proc *, void *, register_t *));
 int	hpux_sys_symlink	__P((struct proc *, void *, register_t *));
 int	hpux_sys_utssys	__P((struct proc *, void *, register_t *));
 int	hpux_sys_readlink	__P((struct proc *, void *, register_t *));
-int	sys_execve	__P((struct proc *, void *, register_t *));
+int	hpux_sys_execve	__P((struct proc *, void *, register_t *));
 int	sys_umask	__P((struct proc *, void *, register_t *));
 int	sys_chroot	__P((struct proc *, void *, register_t *));
 int	hpux_sys_fcntl	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/hpux/hpux_syscalls.c b/sys/compat/hpux/hpux_syscalls.c
index 6db313b6893..f43c3d15fd8 100644
--- a/sys/compat/hpux/hpux_syscalls.c
+++ b/sys/compat/hpux/hpux_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.3 1996/08/02 20:29:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.4 1996/08/25 12:19:51 deraadt Exp 
  */
 
 char *hpux_syscallnames[] = {
diff --git a/sys/compat/hpux/hpux_sysent.c b/sys/compat/hpux/hpux_sysent.c
index 3a03ac3da6f..2fbb7cac2c7 100644
--- a/sys/compat/hpux/hpux_sysent.c
+++ b/sys/compat/hpux/hpux_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.3 1996/08/02 20:29:10 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.4 1996/08/25 12:19:51 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -135,8 +135,8 @@ struct sysent hpux_sysent[] = {
 	    hpux_sys_utssys },			/* 57 = utssys */
 	{ 3, s(struct hpux_sys_readlink_args),
 	    hpux_sys_readlink },		/* 58 = readlink */
-	{ 3, s(struct sys_execve_args),
-	    sys_execve },			/* 59 = execve */
+	{ 3, s(struct hpux_sys_execve_args),
+	    hpux_sys_execve },			/* 59 = execve */
 	{ 1, s(struct sys_umask_args),
 	    sys_umask },			/* 60 = umask */
 	{ 1, s(struct sys_chroot_args),
diff --git a/sys/compat/osf1/osf1_syscall.h b/sys/compat/osf1/osf1_syscall.h
index 977901aae2f..2764ed6c102 100644
--- a/sys/compat/osf1/osf1_syscall.h
+++ b/sys/compat/osf1/osf1_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.2 1996/08/02 20:20:30 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.3 1996/08/25 12:19:55 deraadt Exp 
  */
 
 #define	OSF1_SYS_syscall	0
diff --git a/sys/compat/osf1/osf1_syscallargs.h b/sys/compat/osf1/osf1_syscallargs.h
index 39f7dae9049..f0ec6c65ec5 100644
--- a/sys/compat/osf1/osf1_syscallargs.h
+++ b/sys/compat/osf1/osf1_syscallargs.h
@@ -2,7 +2,7 @@
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.2 1996/08/02 20:20:30 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.3 1996/08/25 12:19:55 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -57,6 +57,12 @@ struct osf1_sys_reboot_args {
 	syscallarg(int) opt;
 };
 
+struct osf1_sys_execve_args {
+	syscallarg(char *) path;
+	syscallarg(char **) argp;
+	syscallarg(char **) envp;
+};
+
 struct osf1_sys_stat_args {
 	syscallarg(char *) path;
 	syscallarg(struct osf1_stat *) ub;
@@ -227,7 +233,7 @@ int	osf1_sys_reboot	__P((struct proc *, void *, register_t *));
 int	sys_revoke	__P((struct proc *, void *, register_t *));
 int	sys_symlink	__P((struct proc *, void *, register_t *));
 int	sys_readlink	__P((struct proc *, void *, register_t *));
-int	sys_execve	__P((struct proc *, void *, register_t *));
+int	osf1_sys_execve	__P((struct proc *, void *, register_t *));
 int	sys_umask	__P((struct proc *, void *, register_t *));
 int	sys_chroot	__P((struct proc *, void *, register_t *));
 int	sys_getpgrp	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/osf1/osf1_syscalls.c b/sys/compat/osf1/osf1_syscalls.c
index 38f370f530f..1064dbae100 100644
--- a/sys/compat/osf1/osf1_syscalls.c
+++ b/sys/compat/osf1/osf1_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.2 1996/08/02 20:20:30 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.3 1996/08/25 12:19:55 deraadt Exp 
  */
 
 char *osf1_syscallnames[] = {
diff --git a/sys/compat/osf1/osf1_sysent.c b/sys/compat/osf1/osf1_sysent.c
index 640149f71ad..1f4f741bfde 100644
--- a/sys/compat/osf1/osf1_sysent.c
+++ b/sys/compat/osf1/osf1_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.2 1996/08/02 20:20:30 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.3 1996/08/25 12:19:55 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -134,8 +134,8 @@ struct sysent osf1_sysent[] = {
 	    sys_symlink },			/* 57 = symlink */
 	{ 3, s(struct sys_readlink_args),
 	    sys_readlink },			/* 58 = readlink */
-	{ 3, s(struct sys_execve_args),
-	    sys_execve },			/* 59 = execve */
+	{ 3, s(struct osf1_sys_execve_args),
+	    osf1_sys_execve },			/* 59 = execve */
 	{ 1, s(struct sys_umask_args),
 	    sys_umask },			/* 60 = umask */
 	{ 1, s(struct sys_chroot_args),
diff --git a/sys/compat/sunos/sunos_syscall.h b/sys/compat/sunos/sunos_syscall.h
index e970f2397b2..f1f9518267b 100644
--- a/sys/compat/sunos/sunos_syscall.h
+++ b/sys/compat/sunos/sunos_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 21:55:22 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:19:58 deraadt Exp 
  */
 
 #define	SUNOS_SYS_syscall	0
diff --git a/sys/compat/sunos/sunos_syscallargs.h b/sys/compat/sunos/sunos_syscallargs.h
index 3f3c08be44c..95630c8f9df 100644
--- a/sys/compat/sunos/sunos_syscallargs.h
+++ b/sys/compat/sunos/sunos_syscallargs.h
@@ -2,7 +2,7 @@
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 21:55:22 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:19:58 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -77,6 +77,12 @@ struct sunos_sys_reboot_args {
 	syscallarg(char *) bootstr;
 };
 
+struct sunos_sys_execve_args {
+	syscallarg(char *) path;
+	syscallarg(char **) argp;
+	syscallarg(char **) envp;
+};
+
 struct sunos_sys_omsync_args {
 	syscallarg(caddr_t) addr;
 	syscallarg(size_t) len;
@@ -241,7 +247,7 @@ int	sunos_sys_ioctl	__P((struct proc *, void *, register_t *));
 int	sunos_sys_reboot	__P((struct proc *, void *, register_t *));
 int	sys_symlink	__P((struct proc *, void *, register_t *));
 int	sys_readlink	__P((struct proc *, void *, register_t *));
-int	sys_execve	__P((struct proc *, void *, register_t *));
+int	sunos_sys_execve	__P((struct proc *, void *, register_t *));
 int	sys_umask	__P((struct proc *, void *, register_t *));
 int	sys_chroot	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_fstat	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/sunos/sunos_syscalls.c b/sys/compat/sunos/sunos_syscalls.c
index f618da639f4..49cffe1746f 100644
--- a/sys/compat/sunos/sunos_syscalls.c
+++ b/sys/compat/sunos/sunos_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 21:55:22 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:19:58 deraadt Exp 
  */
 
 char *sunos_syscallnames[] = {
diff --git a/sys/compat/sunos/sunos_sysent.c b/sys/compat/sunos/sunos_sysent.c
index 10475f699c0..c787c19bdfd 100644
--- a/sys/compat/sunos/sunos_sysent.c
+++ b/sys/compat/sunos/sunos_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 21:55:22 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:19:58 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -153,8 +153,8 @@ struct sysent sunos_sysent[] = {
 	    sys_symlink },			/* 57 = symlink */
 	{ 3, s(struct sys_readlink_args),
 	    sys_readlink },			/* 58 = readlink */
-	{ 3, s(struct sys_execve_args),
-	    sys_execve },			/* 59 = execve */
+	{ 3, s(struct sunos_sys_execve_args),
+	    sunos_sys_execve },			/* 59 = execve */
 	{ 1, s(struct sys_umask_args),
 	    sys_umask },			/* 60 = umask */
 	{ 1, s(struct sys_chroot_args),
diff --git a/sys/compat/ultrix/ultrix_syscall.h b/sys/compat/ultrix/ultrix_syscall.h
index 11dcb632970..6c17dea49b2 100644
--- a/sys/compat/ultrix/ultrix_syscall.h
+++ b/sys/compat/ultrix/ultrix_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 20:29:13 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:20:00 deraadt Exp 
  */
 
 #define	ULTRIX_SYS_syscall	0
diff --git a/sys/compat/ultrix/ultrix_syscallargs.h b/sys/compat/ultrix/ultrix_syscallargs.h
index 03320491e4a..85b3392a682 100644
--- a/sys/compat/ultrix/ultrix_syscallargs.h
+++ b/sys/compat/ultrix/ultrix_syscallargs.h
@@ -2,7 +2,7 @@
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 20:29:13 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:20:00 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -58,6 +58,12 @@ struct ultrix_sys_ioctl_args {
 	syscallarg(caddr_t) data;
 };
 
+struct ultrix_sys_execve_args {
+	syscallarg(char *) path;
+	syscallarg(char **) argp;
+	syscallarg(char **) envp;
+};
+
 struct ultrix_sys_mmap_args {
 	syscallarg(caddr_t) addr;
 	syscallarg(size_t) len;
@@ -207,7 +213,7 @@ int	ultrix_sys_ioctl	__P((struct proc *, void *, register_t *));
 int	sys_reboot	__P((struct proc *, void *, register_t *));
 int	sys_symlink	__P((struct proc *, void *, register_t *));
 int	sys_readlink	__P((struct proc *, void *, register_t *));
-int	sys_execve	__P((struct proc *, void *, register_t *));
+int	ultrix_sys_execve	__P((struct proc *, void *, register_t *));
 int	sys_umask	__P((struct proc *, void *, register_t *));
 int	sys_chroot	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_fstat	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/ultrix/ultrix_syscalls.c b/sys/compat/ultrix/ultrix_syscalls.c
index 3f01b530dcd..49c3af11d18 100644
--- a/sys/compat/ultrix/ultrix_syscalls.c
+++ b/sys/compat/ultrix/ultrix_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 20:29:13 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:20:00 deraadt Exp 
  */
 
 char *ultrix_syscallnames[] = {
diff --git a/sys/compat/ultrix/ultrix_sysent.c b/sys/compat/ultrix/ultrix_sysent.c
index bb2f9420075..b26d8940ab5 100644
--- a/sys/compat/ultrix/ultrix_sysent.c
+++ b/sys/compat/ultrix/ultrix_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.4 1996/08/02 20:29:13 niklas Exp 
+ * created from	OpenBSD: syscalls.master,v 1.5 1996/08/25 12:20:00 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -151,8 +151,8 @@ struct sysent ultrix_sysent[] = {
 	    sys_symlink },			/* 57 = symlink */
 	{ 3, s(struct sys_readlink_args),
 	    sys_readlink },			/* 58 = readlink */
-	{ 3, s(struct sys_execve_args),
-	    sys_execve },			/* 59 = execve */
+	{ 3, s(struct ultrix_sys_execve_args),
+	    ultrix_sys_execve },		/* 59 = execve */
 	{ 1, s(struct sys_umask_args),
 	    sys_umask },			/* 60 = umask */
 	{ 1, s(struct sys_chroot_args),