Rename ostat -> stat43 to disambiguate from upcoming struct stat changes.

Idea from NetBSD, OK deraadt@

12 files changed, 52 insertions, 54 deletions

diff --git a/sys/compat/bsdos/syscalls.master b/sys/compat/bsdos/syscalls.master
index 9d6d717cd83..23c1519292c 100644
--- a/sys/compat/bsdos/syscalls.master
+++ b/sys/compat/bsdos/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.13 2004/05/28 18:28:14 tedu Exp $
+	$OpenBSD: syscalls.master,v 1.14 2004/07/09 23:52:02 millert Exp $
 
 ; OpenBSD COMPAT_BSDOS system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
@@ -96,10 +96,10 @@
 36	NOARGS		{ int sys_sync(void); }
 37	NOARGS		{ int sys_kill(int pid, int signum); }
 38	NOARGS		{ int compat_43_sys_stat(char *path, \
-			    struct ostat *ub); } ostat
+			    struct stat43 *ub); } stat43
 39	NOARGS		{ pid_t sys_getppid(void); }
 40	NOARGS		{ int compat_43_sys_lstat(char *path, \
-			    struct ostat *ub); } olstat
+			    struct stat43 *ub); } lstat43
 41	NOARGS		{ int sys_dup(u_int fd); }
 42	NOARGS		{ int sys_opipe(void); }
 43	NOARGS		{ gid_t sys_getegid(void); }
@@ -135,8 +135,8 @@
 			    char **envp); }
 60	NOARGS		{ int sys_umask(int newmask); }
 61	NOARGS		{ int sys_chroot(char *path); }
-62	NOARGS		{ int compat_43_sys_fstat(int fd, struct ostat *sb); } \
-			    ofstat
+62	NOARGS		{ int compat_43_sys_fstat(int fd, struct stat43 *sb); } \
+			    fstat43
 63	NOARGS		{ int compat_43_sys_getkerninfo(int op, char *where, \
 			    int *size, int arg); } ogetkerninfo
 64	NOARGS		{ int compat_43_sys_getpagesize(void); } ogetpagesize
diff --git a/sys/compat/common/vfs_syscalls_43.c b/sys/compat/common/vfs_syscalls_43.c
index 2c409c5f669..0b4d33250f1 100644
--- a/sys/compat/common/vfs_syscalls_43.c
+++ b/sys/compat/common/vfs_syscalls_43.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls_43.c,v 1.22 2003/06/02 23:27:59 millert Exp $	*/
+/*	$OpenBSD: vfs_syscalls_43.c,v 1.23 2004/07/09 23:52:02 millert Exp $	*/
 /*	$NetBSD: vfs_syscalls_43.c,v 1.4 1996/03/14 19:31:52 christos Exp $	*/
 
 /*
@@ -63,7 +63,7 @@
 
 #include <sys/pipe.h>
 
-static void cvtstat(struct stat *, struct ostat *);
+static void cvtstat(struct stat *, struct stat43 *);
 
 /*
  * Redirection info so we don't have to include the union fs routines in 
@@ -82,7 +82,7 @@ extern int (*union_check_p)(struct proc *, struct vnode **,
 static void
 cvtstat(st, ost)
 	struct stat *st;
-	struct ostat *ost;
+	struct stat43 *ost;
 {
 
 	ost->st_dev = st->st_dev;
@@ -117,10 +117,10 @@ compat_43_sys_stat(p, v, retval)
 {
 	register struct compat_43_sys_stat_args /* {
 		syscallarg(char *) path;
-		syscallarg(struct ostat *) ub;
+		syscallarg(struct stat43 *) ub;
 	} */ *uap = v;
 	struct stat sb;
-	struct ostat osb;
+	struct stat43 osb;
 	int error;
 	struct nameidata nd;
 
@@ -150,10 +150,10 @@ compat_43_sys_lstat(p, v, retval)
 {
 	register struct compat_43_sys_lstat_args /* {
 		syscallarg(char *) path;
-		syscallarg(struct ostat *) ub;
+		syscallarg(struct stat43 *) ub;
 	} */ *uap = v;
 	struct stat sb;
-	struct ostat osb;
+	struct stat43 osb;
 	int error;
 	struct nameidata nd;
 
@@ -183,13 +183,13 @@ compat_43_sys_fstat(p, v, retval)
 {
 	struct compat_43_sys_fstat_args /* {
 		syscallarg(int) fd;
-		syscallarg(struct ostat *) sb;
+		syscallarg(struct stat43 *) sb;
 	} */ *uap = v;
 	int fd = SCARG(uap, fd);
 	struct filedesc *fdp = p->p_fd;
 	struct file *fp;
 	struct stat ub;
-	struct ostat oub;
+	struct stat43 oub;
 	int error;
 
 	if ((fp = fd_getfile(fdp, fd)) == NULL)
diff --git a/sys/compat/freebsd/freebsd_file.c b/sys/compat/freebsd/freebsd_file.c
index b4388177509..56baf4b0b11 100644
--- a/sys/compat/freebsd/freebsd_file.c
+++ b/sys/compat/freebsd/freebsd_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_file.c,v 1.17 2003/08/15 20:32:15 tedu Exp $	*/
+/*	$OpenBSD: freebsd_file.c,v 1.18 2004/07/09 23:52:02 millert Exp $	*/
 /*	$NetBSD: freebsd_file.c,v 1.3 1996/05/03 17:03:09 christos Exp $	*/
 
 /*
@@ -339,7 +339,7 @@ compat_43_freebsd_sys_stat(p, v, retval)
 {
 	struct compat_43_freebsd_sys_stat_args /* {
 		syscallarg(char *) path;
-		syscallarg(struct ostat *) ub;
+		syscallarg(struct stat43 *) ub;
 	} */ *uap = v;
 	caddr_t sg = stackgap_init(p->p_emul);
 
@@ -355,7 +355,7 @@ compat_43_freebsd_sys_lstat(p, v, retval)
 {
 	struct compat_43_freebsd_sys_lstat_args /* {
 		syscallarg(char *) path;
-		syscallarg(struct ostat *) ub;
+		syscallarg(struct stat43 *) ub;
 	} */ *uap = v;
 	caddr_t sg = stackgap_init(p->p_emul);
 
diff --git a/sys/compat/freebsd/syscalls.master b/sys/compat/freebsd/syscalls.master
index 62ce51d010c..326483d1974 100644
--- a/sys/compat/freebsd/syscalls.master
+++ b/sys/compat/freebsd/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.24 2004/05/28 18:28:14 tedu Exp $
+	$OpenBSD: syscalls.master,v 1.25 2004/07/09 23:52:02 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.3 1995/10/10 18:28:40 mycroft Exp $
 
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -104,10 +104,10 @@
 36	NOARGS		{ int sys_sync(void); }
 37	NOARGS		{ int sys_kill(int pid, int signum); }
 38	STD		{ int compat_43_freebsd_sys_stat(char *path, \
-			    struct ostat *ub); } ostat
+			    struct stat43 *ub); } stat43
 39	NOARGS		{ pid_t sys_getppid(void); }
 40	STD		{ int compat_43_freebsd_sys_lstat(char *path, \
-			    struct ostat *ub); } olstat
+			    struct stat43 *ub); } lstat43
 41	NOARGS		{ int sys_dup(u_int fd); }
 42	NOARGS		{ int sys_opipe(void); }
 43	NOARGS		{ gid_t sys_getegid(void); }
@@ -144,8 +144,8 @@
 			    char **envp); }
 60	NOARGS		{ int sys_umask(int newmask); }
 61	STD		{ int freebsd_sys_chroot(char *path); }
-62	NOARGS		{ int compat_43_sys_fstat(int fd, struct ostat *sb); } \
-			    ofstat
+62	NOARGS		{ int compat_43_sys_fstat(int fd, struct stat43 *sb); } \
+			    fstat43
 63	NOARGS		{ int compat_43_sys_getkerninfo(int op, char *where, \
 			    int *size, int arg); } ogetkerninfo
 64	NOARGS		{ int compat_43_sys_getpagesize(void); } ogetpagesize
diff --git a/sys/compat/ibcs2/ibcs2_stat.c b/sys/compat/ibcs2/ibcs2_stat.c
index 77b0a6839d3..a0789772750 100644
--- a/sys/compat/ibcs2/ibcs2_stat.c
+++ b/sys/compat/ibcs2/ibcs2_stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_stat.c,v 1.12 2003/10/01 08:03:01 itojun Exp $	*/
+/*	$OpenBSD: ibcs2_stat.c,v 1.13 2004/07/09 23:52:02 millert Exp $	*/
 /*	$NetBSD: ibcs2_stat.c,v 1.5 1996/05/03 17:05:32 christos Exp $	*/
 
 /*
@@ -54,12 +54,12 @@
 #include <compat/ibcs2/ibcs2_util.h>
 #include <compat/ibcs2/ibcs2_utsname.h>
 
-static void bsd_stat2ibcs_stat(struct ostat *, struct ibcs2_stat *);
+static void bsd_stat2ibcs_stat(struct stat43 *, struct ibcs2_stat *);
 static int cvt_statfs(struct statfs *, caddr_t, int);
 
 static void
 bsd_stat2ibcs_stat(st, st4)
-	struct ostat *st;
+	struct stat43 *st;
 	struct ibcs2_stat *st4;
 {
 	bzero(st4, sizeof(*st4));
@@ -172,7 +172,7 @@ ibcs2_sys_stat(p, v, retval)
 		syscallarg(char *) path;
 		syscallarg(struct ibcs2_stat *) st;
 	} */ *uap = v;
-	struct ostat st;
+	struct stat43 st;
 	struct ibcs2_stat ibcs2_st;
 	struct compat_43_sys_stat_args cup;
 	int error;
@@ -201,7 +201,7 @@ ibcs2_sys_lstat(p, v, retval)
 		syscallarg(char *) path;
 		syscallarg(struct ibcs2_stat *) st;
 	} */ *uap = v;
-	struct ostat st;
+	struct stat43 st;
 	struct ibcs2_stat ibcs2_st;
 	struct compat_43_sys_lstat_args cup;
 	int error;
@@ -230,7 +230,7 @@ ibcs2_sys_fstat(p, v, retval)
 		syscallarg(int) fd;
 		syscallarg(struct ibcs2_stat *) st;
 	} */ *uap = v;
-	struct ostat st;
+	struct stat43 st;
 	struct ibcs2_stat ibcs2_st;
 	struct compat_43_sys_fstat_args cup;
 	int error;
diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master
index b7d6b11718c..2c72a76db3c 100644
--- a/sys/compat/linux/syscalls.master
+++ b/sys/compat/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.47 2004/05/28 18:28:14 tedu Exp $
+	$OpenBSD: syscalls.master,v 1.48 2004/07/09 23:52:02 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -156,7 +156,7 @@
 82	STD		{ int linux_sys_oldselect(struct linux_select *lsp); }
 83	STD		{ int linux_sys_symlink(char *path, char *to); }
 84	NOARGS		{ int compat_43_sys_lstat(char *path, \
-			    struct ostat *up); } olstat
+			    struct stat43 *up); } olstat
 85	STD		{ int linux_sys_readlink(char *name, char *buf, \
 			    int count); }
 86	STD		{ int linux_sys_uselib(char *path); }
diff --git a/sys/compat/netbsd/netbsd_stat.c b/sys/compat/netbsd/netbsd_stat.c
index e9b8aaa63e5..dc022272773 100644
--- a/sys/compat/netbsd/netbsd_stat.c
+++ b/sys/compat/netbsd/netbsd_stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_stat.c,v 1.16 2003/08/15 20:32:16 tedu Exp $	*/
+/*	$OpenBSD: netbsd_stat.c,v 1.17 2004/07/09 23:52:02 millert Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -209,7 +209,7 @@ compat_43_netbsd_sys_stat(p, v, retval)
 {
 	struct compat_43_netbsd_sys_stat_args /* {
 		syscallarg(char *) path;
-		syscallarg(struct ostat *) ub;
+		syscallarg(struct stat43 *) ub;
 	} */ *uap = v;
 	caddr_t sg = stackgap_init(p->p_emul);
 
@@ -225,7 +225,7 @@ compat_43_netbsd_sys_lstat(p, v, retval)
 {
 	struct compat_43_netbsd_sys_lstat_args /* {
 		syscallarg(char *) path;
-		syscallarg(struct ostat *) ub;
+		syscallarg(struct stat43 *) ub;
 	} */ *uap = v;
 	caddr_t sg = stackgap_init(p->p_emul);
 
diff --git a/sys/compat/netbsd/syscalls.master b/sys/compat/netbsd/syscalls.master
index 154af650df5..d0138644513 100644
--- a/sys/compat/netbsd/syscalls.master
+++ b/sys/compat/netbsd/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.22 2004/05/28 18:28:14 tedu Exp $
+;	$OpenBSD: syscalls.master,v 1.23 2004/07/09 23:52:02 millert Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -121,13 +121,11 @@
 35	NOARGS		{ int sys_fchflags(int fd, u_int flags); }
 36	NOARGS		{ void sys_sync(void); }
 37	NOARGS		{ int sys_kill(int pid, int signum); }
-; XXX struct stat43 *ub vs. struct ostat *ub
 38	STD		{ int compat_43_netbsd_sys_stat(char *path, \
-			    struct ostat *ub); } ostat
+			    struct stat43 *ub); } stat43
 39	NOARGS		{ pid_t sys_getppid(void); }
-; XXX struct stat43 *ub vs. struct ostat *ub
 40	STD		{ int compat_43_netbsd_sys_lstat(char *path, \
-			    struct ostat *ub); } olstat
+			    struct stat43 *ub); } lstat43
 41	NOARGS		{ int sys_dup(int fd); }
 42	NOARGS		{ int sys_opipe(void); }
 43	NOARGS		{ gid_t sys_getegid(void); }
@@ -165,7 +163,7 @@
 			    char **argp, char **envp); }
 60	NOARGS		{ int sys_umask(int newmask); }
 61	STD		{ int netbsd_sys_chroot(char *path); }
-62	NOARGS		{ int sys_fstat(int fd, struct ostat *sb); } ofstat
+62	NOARGS		{ int sys_fstat(int fd, struct stat43 *sb); } fstat43
 63	NOARGS		{ int compat_43_sys_getkerninfo(int op, char *where, \
 			    int *size, int arg); } ogetkerninfo
 64	NOARGS		{ int compat_43_sys_getpagesize(void); } ogetpagesize
diff --git a/sys/compat/sunos/syscalls.master b/sys/compat/sunos/syscalls.master
index c886f855626..5415c656b63 100644
--- a/sys/compat/sunos/syscalls.master
+++ b/sys/compat/sunos/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.15 2004/05/28 18:28:14 tedu Exp $
+	$OpenBSD: syscalls.master,v 1.16 2004/07/09 23:52:02 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.33 1996/02/28 16:05:43 pk Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -86,9 +86,9 @@
 35	UNIMPL		sunos_ftime
 36	NOARGS		{ int sys_sync(void); }
 37	NOARGS		{ int sys_kill(int pid, int signum); }
-38	STD		{ int sunos_sys_stat(char *path, struct ostat *ub); }
+38	STD		{ int sunos_sys_stat(char *path, struct stat43 *ub); }
 39	UNIMPL		sunos_setpgrp
-40	STD		{ int sunos_sys_lstat(char *path, struct ostat *ub); }
+40	STD		{ int sunos_sys_lstat(char *path, struct stat43 *ub); }
 41	NOARGS		{ int sys_dup(u_int fd); }
 42	NOARGS		{ int sys_opipe(void); }
 43	STD		{ int sunos_sys_otimes(struct tms *tp); }
@@ -118,7 +118,7 @@
 			    char **envp); }
 60	NOARGS		{ int sys_umask(int newmask); }
 61	NOARGS		{ int sys_chroot(char *path); }
-62	NOARGS		{ int compat_43_sys_fstat(int fd, struct ostat *sb); }
+62	NOARGS		{ int compat_43_sys_fstat(int fd, struct stat43 *sb); }
 63	UNIMPL		
 64	NOARGS		{ int compat_43_sys_getpagesize(void); }
 65	NOARGS		{ int sys_msync(void *addr, size_t len, \
diff --git a/sys/compat/ultrix/syscalls.master b/sys/compat/ultrix/syscalls.master
index b735e17a394..784131c9927 100644
--- a/sys/compat/ultrix/syscalls.master
+++ b/sys/compat/ultrix/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.10 2004/05/28 18:28:14 tedu Exp $
+	$OpenBSD: syscalls.master,v 1.11 2004/07/09 23:52:02 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.15 1996/01/07 13:38:57 jonathan Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -81,10 +81,10 @@
 36	NOARGS		{ int sys_sync(void); }
 37	NOARGS		{ int sys_kill(int pid, int signum); }
 38	STD		{ int ultrix_sys_stat(char *path, \
-			    struct ostat *ub); } ostat
+			    struct stat43 *ub); } stat43
 39	OBSOL		v7 setpgrp
 40	STD		{ int ultrix_sys_lstat(char *path, \
-			    struct ostat *ub); } olstat
+			    struct stat43 *ub); } olstat
 41	NOARGS		{ int sys_dup(u_int fd); }
 42	NOARGS		{ int sys_opipe(void); }
 43	OBSOL		v7 times
@@ -112,7 +112,7 @@
 			    char **envp); }
 60	NOARGS		{ int sys_umask(int newmask); }
 61	NOARGS		{ int sys_chroot(char *path); }
-62	NOARGS		{ int compat_43_sys_fstat(int fd, struct ostat *sb); }
+62	NOARGS		{ int compat_43_sys_fstat(int fd, struct stat43 *sb); }
 63	UNIMPL
 64	NOARGS		{ int compat_43_sys_getpagesize(void); }
 65	UNIMPL		mremap
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 1354c51d54d..84e08e0995f 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.70 2004/05/27 20:48:46 tedu Exp $
+;	$OpenBSD: syscalls.master,v 1.71 2004/07/09 23:52:02 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -107,11 +107,11 @@
 35	STD		{ int sys_fchflags(int fd, u_int flags); }
 36	STD		{ void sys_sync(void); }
 37	STD		{ int sys_kill(int pid, int signum); }
-38	COMPAT_43	{ int sys_stat(const char *path, struct ostat *ub); } \
-			    ostat
+38	COMPAT_43	{ int sys_stat(const char *path, struct stat43 *ub); } \
+			    stat43
 39	STD		{ pid_t sys_getppid(void); }
 40	COMPAT_43	{ int sys_lstat(char *path, \
-			    struct ostat *ub); } olstat
+			    struct stat43 *ub); } lstat43
 41	STD		{ int sys_dup(int fd); }
 42	STD		{ int sys_opipe(void); }
 43	STD		{ gid_t sys_getegid(void); }
@@ -150,7 +150,7 @@
 			    char * const *argp, char * const *envp); }
 60	STD		{ int sys_umask(int newmask); }
 61	STD		{ int sys_chroot(const char *path); }
-62	COMPAT_43	{ int sys_fstat(int fd, struct ostat *sb); } ofstat
+62	COMPAT_43	{ int sys_fstat(int fd, struct stat43 *sb); } fstat43
 63	COMPAT_43	{ int sys_getkerninfo(int op, char *where, int *size, \
 			    int arg); } ogetkerninfo
 64	COMPAT_43	{ int sys_getpagesize(void); } ogetpagesize
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 21cea903166..f46f131a33b 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stat.h,v 1.12 2003/06/02 23:28:21 millert Exp $	*/
+/*	$OpenBSD: stat.h,v 1.13 2004/07/09 23:52:01 millert Exp $	*/
 /*	$NetBSD: stat.h,v 1.20 1996/05/16 22:17:49 cgd Exp $	*/
 
 /*-
@@ -43,7 +43,7 @@
 #include <sys/time.h>
 
 #ifdef _KERNEL
-struct ostat {
+struct stat43 {
 	u_int16_t st_dev;		/* inode's device */
 	ino_t	  st_ino;		/* inode's number */
 	mode_t	  st_mode;		/* inode protection mode */