From b041fac92d5679d154dea029acccfaba0d0c7bdc Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Fri, 19 Aug 2005 04:24:38 +0000
Subject: [PATCH] Fix lossage I created with the 64 bit ino_t change.

---
 sys/compat/netbsd32/netbsd32.h             |  8 ++---
 sys/compat/netbsd32/netbsd32_compat_20.c   |  5 +--
 sys/compat/netbsd32/netbsd32_compat_30.c   | 13 ++++----
 sys/compat/netbsd32/netbsd32_conv.h        | 13 +++++---
 sys/compat/netbsd32/netbsd32_fs.c          | 27 +++++++--------
 sys/compat/netbsd32/netbsd32_ipc.c         |  5 +--
 sys/compat/netbsd32/netbsd32_netbsd.c      |  5 +--
 sys/compat/netbsd32/netbsd32_select.c      |  5 +--
 sys/compat/netbsd32/netbsd32_signal.c      |  5 +--
 sys/compat/netbsd32/netbsd32_socket.c      |  5 +--
 sys/compat/netbsd32/netbsd32_syscall.h     | 24 +++++++++----
 sys/compat/netbsd32/netbsd32_syscallargs.h | 39 +++++++++++++++++++---
 sys/compat/netbsd32/netbsd32_syscalls.c    | 10 ++++--
 sys/compat/netbsd32/netbsd32_sysctl.c      |  5 +--
 sys/compat/netbsd32/netbsd32_sysent.c      | 22 ++++++------
 sys/compat/netbsd32/netbsd32_time.c        |  5 +--
 sys/compat/netbsd32/netbsd32_wait.c        |  5 +--
 sys/compat/netbsd32/syscalls.master        | 10 +++---
 18 files changed, 135 insertions(+), 76 deletions(-)

diff --git a/sys/compat/netbsd32/netbsd32.h b/sys/compat/netbsd32/netbsd32.h
index 5940820ab5c0..d656a3245a90 100644
--- a/sys/compat/netbsd32/netbsd32.h
+++ b/sys/compat/netbsd32/netbsd32.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32.h,v 1.38 2005/08/19 02:03:57 christos Exp $	*/
+/*	$NetBSD: netbsd32.h,v 1.39 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -474,8 +474,8 @@ struct netbsd32_stat43 {			/* BSD-4.3 stat struct */
 	u_int32_t st_flags;		/* user defined flags for file */
 	u_int32_t st_gen;		/* file generation number */
 };
-typedef netbsd32_pointer_t netbsd32_stat30p_t;
-struct netbsd32_stat30 {
+typedef netbsd32_pointer_t netbsd32_stat13p_t;
+struct netbsd32_stat13 {
 	dev_t	  st_dev;		/* inode's device */
 	u_int32_t st_ino;		/* inode's number */
 	mode_t	  st_mode;		/* inode protection mode */
@@ -494,7 +494,7 @@ struct netbsd32_stat30 {
 	u_int32_t st_spare;		/* file generation number */
 	struct	  netbsd32_timespec st_birthtimespec;
 	u_int32_t st_spare2;
-}
+};
 
 typedef netbsd32_pointer_t netbsd32_statp_t;
 struct netbsd32_stat {
diff --git a/sys/compat/netbsd32/netbsd32_compat_20.c b/sys/compat/netbsd32/netbsd32_compat_20.c
index b67298ad3aca..a9a7e74b5927 100644
--- a/sys/compat/netbsd32/netbsd32_compat_20.c
+++ b/sys/compat/netbsd32/netbsd32_compat_20.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_20.c,v 1.1 2004/06/17 18:29:40 cube Exp $	*/
+/*	$NetBSD: netbsd32_compat_20.c,v 1.2 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.1 2004/06/17 18:29:40 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.2 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.1 2004/06/17 18:29:40 cube
 #include <sys/sa.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
+#include <sys/dirent.h>
 
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
diff --git a/sys/compat/netbsd32/netbsd32_compat_30.c b/sys/compat/netbsd32/netbsd32_compat_30.c
index 208c485b8531..26ae2b4a7407 100644
--- a/sys/compat/netbsd32/netbsd32_compat_30.c
+++ b/sys/compat/netbsd32/netbsd32_compat_30.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_30.c,v 1.1 2005/08/19 02:03:57 christos Exp $	*/
+/*	$NetBSD: netbsd32_compat_30.c,v 1.2 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.1 2005/08/19 02:03:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.2 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.1 2005/08/19 02:03:57 chris
 #include <sys/statvfs.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
+#include <sys/dirent.h>
 
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
@@ -83,7 +84,7 @@ netbsd32_getdents(l, v, retval)
 		goto out;
 	}
 	buf = malloc(SCARG(uap, count), M_TEMP, M_WAITOK);
-	error = vn_readdir(fp, obuf,
+	error = vn_readdir(fp, buf,
 	    UIO_SYSSPACE, SCARG(uap, count), &done, p, 0, 0);
 	if (error == 0) {
 		*retval = netbsd32_to_dirent12(buf, done);
@@ -105,7 +106,7 @@ netbsd32___stat13(l, v, retval)
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat13p_t) ub;
 	} */ *uap = v;
-	struct netbsd32_stat30 sb32;
+	struct netbsd32_stat13 sb32;
 	struct stat sb;
 	int error;
 	struct nameidata nd;
@@ -144,7 +145,7 @@ netbsd32___fstat13(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct filedesc *fdp = p->p_fd;
 	struct file *fp;
-	struct netbsd32_stat sb32;
+	struct netbsd32_stat13 sb32;
 	struct stat ub;
 	int error = 0;
 
@@ -173,7 +174,7 @@ netbsd32___lstat13(l, v, retval)
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat13p_t) ub;
 	} */ *uap = v;
-	struct netbsd32_stat sb32;
+	struct netbsd32_stat13 sb32;
 	struct stat sb;
 	int error;
 	struct nameidata nd;
diff --git a/sys/compat/netbsd32/netbsd32_conv.h b/sys/compat/netbsd32/netbsd32_conv.h
index c0b34759c9c7..8a25e3808255 100644
--- a/sys/compat/netbsd32/netbsd32_conv.h
+++ b/sys/compat/netbsd32/netbsd32_conv.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_conv.h,v 1.8 2005/08/19 02:03:57 christos Exp $	*/
+/*	$NetBSD: netbsd32_conv.h,v 1.9 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -67,7 +67,8 @@ static __inline void netbsd32_from_msghdr __P((struct netbsd32_msghdr *, const s
 static __inline void netbsd32_from_statvfs __P((const struct statvfs *, struct netbsd32_statvfs *));
 static __inline void netbsd32_from_timex __P((const struct timex *, struct netbsd32_timex *));
 static __inline void netbsd32_to_timex __P((const struct netbsd32_timex *, struct timex *));
-static __inline void netbsd32_from___stat13 __P((const struct stat *, struct netbsd32_stat *));
+static __inline void netbsd32_from___stat13 __P((const struct stat *, struct netbsd32_stat13 *));
+static __inline void netbsd32_from___stat30 __P((const struct stat *, struct netbsd32_stat *));
 static __inline void netbsd32_to_ipc_perm __P((const struct netbsd32_ipc_perm *, struct ipc_perm *));
 static __inline void netbsd32_from_ipc_perm __P((const struct ipc_perm *, struct netbsd32_ipc_perm *));
 static __inline void netbsd32_to_msg __P((const struct netbsd32_msg *, struct msg *));
@@ -80,6 +81,7 @@ static __inline void netbsd32_to_semid_ds __P((const struct  netbsd32_semid_ds *
 static __inline void netbsd32_from_semid_ds __P((const struct  semid_ds *, struct  netbsd32_semid_ds *));
 static __inline void netbsd32_from_loadavg __P((struct netbsd32_loadavg *, const struct loadavg *));
 static __inline void netbsd32_to_sigevent(const struct netbsd32_sigevent *, struct sigevent *);
+static __inline int  netbsd32_to_dirent12(char *, int);
 
 /* converters for structures that we need */
 static __inline void
@@ -571,8 +573,9 @@ netbsd32_to_sigevent(const struct netbsd32_sigevent *ev32, struct sigevent *ev)
 	ev->sigev_notify_function = (void *)(intptr_t)ev32->sigev_notify_function;
 	ev->sigev_notify_attributes = (void *)(intptr_t)ev32->sigev_notify_attributes;
 }
-int
-netbsd32_to_dirent12(char *nbuf, char *obuf, int nbytes)
+
+static __inline int
+netbsd32_to_dirent12(char *buf, int nbytes)
 {
 	struct dirent *ndp, *nndp, *endp;
 	struct dirent12 *odp;
@@ -588,7 +591,7 @@ netbsd32_to_dirent12(char *nbuf, char *obuf, int nbytes)
 	 */
 	for (; ndp < endp; ndp = nndp) {
 		nndp = _DIRENT_NEXT(ndp);
-		odp->d_ino = (u_int32_t)ndp->d_ino;
+		odp->d_fileno = (u_int32_t)ndp->d_fileno;
 		if (ndp->d_namlen >= sizeof(odp->d_name))
 			odp->d_namlen = sizeof(odp->d_name) - 1;
 		else
diff --git a/sys/compat/netbsd32/netbsd32_fs.c b/sys/compat/netbsd32/netbsd32_fs.c
index 05e0a9fe963f..30982f00c02f 100644
--- a/sys/compat/netbsd32/netbsd32_fs.c
+++ b/sys/compat/netbsd32/netbsd32_fs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_fs.c,v 1.21 2005/08/19 02:03:57 christos Exp $	*/
+/*	$NetBSD: netbsd32_fs.c,v 1.22 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.21 2005/08/19 02:03:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.22 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.21 2005/08/19 02:03:57 christos Ex
 #include <sys/statvfs.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
+#include <sys/dirent.h>
 
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
@@ -615,12 +616,12 @@ netbsd32_futimes(l, v, retval)
 }
 
 int
-netbsd32___getdents30(l, v, retval)
+netbsd32_sys___getdents30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
-	struct netbsd32_getdents_args /* {
+	struct netbsd32_sys___getdents30_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_charp) buf;
 		syscallarg(netbsd32_size_t) count;
@@ -670,12 +671,12 @@ netbsd32_lutimes(l, v, retval)
 }
 
 int
-netbsd32___stat13(l, v, retval)
+netbsd32_sys___stat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
-	struct netbsd32___stat13_args /* {
+	struct netbsd32_sys___stat30_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_statp_t) ub;
 	} */ *uap = v;
@@ -698,19 +699,19 @@ netbsd32___stat13(l, v, retval)
 	vput(nd.ni_vp);
 	if (error)
 		return (error);
-	netbsd32_from___stat13(&sb, &sb32);
+	netbsd32_from___stat30(&sb, &sb32);
 	error = copyout(&sb32, (caddr_t)NETBSD32PTR64(SCARG(uap, ub)),
 	    sizeof(sb32));
 	return (error);
 }
 
 int
-netbsd32___fstat13(l, v, retval)
+netbsd32_sys___fstat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
-	struct netbsd32___fstat13_args /* {
+	struct netbsd32_sys___fstat30_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_statp_t) sb;
 	} */ *uap = v;
@@ -730,7 +731,7 @@ netbsd32___fstat13(l, v, retval)
 	FILE_UNUSE(fp, p);
 
 	if (error == 0) {
-		netbsd32_from___stat13(&ub, &sb32);
+		netbsd32_from___stat30(&ub, &sb32);
 		error = copyout(&sb32, (caddr_t)NETBSD32PTR64(SCARG(uap, sb)),
 		    sizeof(sb32));
 	}
@@ -738,12 +739,12 @@ netbsd32___fstat13(l, v, retval)
 }
 
 int
-netbsd32___lstat13(l, v, retval)
+netbsd32_sys___lstat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
-	struct netbsd32___lstat13_args /* {
+	struct netbsd32_sys___lstat30_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_statp_t) ub;
 	} */ *uap = v;
@@ -766,7 +767,7 @@ netbsd32___lstat13(l, v, retval)
 	vput(nd.ni_vp);
 	if (error)
 		return (error);
-	netbsd32_from___stat13(&sb, &sb32);
+	netbsd32_from___stat30(&sb, &sb32);
 	error = copyout(&sb32, (caddr_t)NETBSD32PTR64(SCARG(uap, ub)),
 	    sizeof(sb32));
 	return (error);
diff --git a/sys/compat/netbsd32/netbsd32_ipc.c b/sys/compat/netbsd32/netbsd32_ipc.c
index 420f7f14a6a3..465a5a1f830b 100644
--- a/sys/compat/netbsd32/netbsd32_ipc.c
+++ b/sys/compat/netbsd32/netbsd32_ipc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_ipc.c,v 1.5 2003/01/18 08:28:26 thorpej Exp $	*/
+/*	$NetBSD: netbsd32_ipc.c,v 1.6 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.5 2003/01/18 08:28:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.6 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.5 2003/01/18 08:28:26 thorpej Exp
 #include <sys/sem.h>
 #include <sys/shm.h>
 #include <sys/mount.h>
+#include <sys/dirent.h>
 
 #include <sys/sa.h>
 #include <sys/syscallargs.h>
diff --git a/sys/compat/netbsd32/netbsd32_netbsd.c b/sys/compat/netbsd32/netbsd32_netbsd.c
index 381d2d7eaca9..388e3f3c9579 100644
--- a/sys/compat/netbsd32/netbsd32_netbsd.c
+++ b/sys/compat/netbsd32/netbsd32_netbsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.97 2005/07/12 15:06:17 martin Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.98 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.97 2005/07/12 15:06:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.98 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -74,6 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.97 2005/07/12 15:06:17 martin
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/namei.h>
+#include <sys/dirent.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/compat/netbsd32/netbsd32_select.c b/sys/compat/netbsd32/netbsd32_select.c
index 7b18366f4a31..7eee65fbe90b 100644
--- a/sys/compat/netbsd32/netbsd32_select.c
+++ b/sys/compat/netbsd32/netbsd32_select.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_select.c,v 1.7 2005/07/09 22:40:13 cube Exp $	*/
+/*	$NetBSD: netbsd32_select.c,v 1.8 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.7 2005/07/09 22:40:13 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.8 2005/08/19 04:24:38 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.7 2005/07/09 22:40:13 cube Exp
 #include <sys/filedesc.h>
 #include <sys/poll.h>
 #include <sys/select.h>
+#include <sys/dirent.h>
 
 #include <sys/proc.h>
 
diff --git a/sys/compat/netbsd32/netbsd32_signal.c b/sys/compat/netbsd32/netbsd32_signal.c
index 6d8db0c5e350..d96c45046e29 100644
--- a/sys/compat/netbsd32/netbsd32_signal.c
+++ b/sys/compat/netbsd32/netbsd32_signal.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_signal.c,v 1.10 2005/07/23 22:03:45 cube Exp $	*/
+/*	$NetBSD: netbsd32_signal.c,v 1.11 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.10 2005/07/23 22:03:45 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.11 2005/08/19 04:24:38 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.10 2005/07/23 22:03:45 cube Ex
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/wait.h>
+#include <sys/dirent.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/compat/netbsd32/netbsd32_socket.c b/sys/compat/netbsd32/netbsd32_socket.c
index 60fbd8e3f386..38ebd55c6a52 100644
--- a/sys/compat/netbsd32/netbsd32_socket.c
+++ b/sys/compat/netbsd32/netbsd32_socket.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_socket.c,v 1.14 2005/05/31 00:41:09 christos Exp $	*/
+/*	$NetBSD: netbsd32_socket.c,v 1.15 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.14 2005/05/31 00:41:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.15 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.14 2005/05/31 00:41:09 christo
 #include <sys/sa.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
+#include <sys/dirent.h>
 
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
diff --git a/sys/compat/netbsd32/netbsd32_syscall.h b/sys/compat/netbsd32/netbsd32_syscall.h
index 0631ce726015..8c04561bf05d 100644
--- a/sys/compat/netbsd32/netbsd32_syscall.h
+++ b/sys/compat/netbsd32/netbsd32_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.44 2005/07/23 22:04:12 cube Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.45 2005/08/19 04:24:38 christos Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.37 2005/07/23 22:03:45 cube Exp
+ * created from	NetBSD: syscalls.master,v 1.38 2005/08/19 02:03:57 christos Exp
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -745,13 +745,13 @@
 /* syscall: "netbsd32___msync13" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
 #define	netbsd32_SYS_netbsd32___msync13	277
 
-/* syscall: "netbsd32___stat13" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
+/* syscall: "netbsd32___stat13" ret: "int" args: "const netbsd32_charp" "netbsd32_stat13p_t" */
 #define	netbsd32_SYS_netbsd32___stat13	278
 
-/* syscall: "netbsd32___fstat13" ret: "int" args: "int" "netbsd32_statp_t" */
+/* syscall: "netbsd32___fstat13" ret: "int" args: "int" "netbsd32_stat13p_t" */
 #define	netbsd32_SYS_netbsd32___fstat13	279
 
-/* syscall: "netbsd32___lstat13" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
+/* syscall: "netbsd32___lstat13" ret: "int" args: "const netbsd32_charp" "netbsd32_stat13p_t" */
 #define	netbsd32_SYS_netbsd32___lstat13	280
 
 /* syscall: "netbsd32___sigaltstack14" ret: "int" args: "const netbsd32_sigaltstackp_t" "netbsd32_sigaltstackp_t" */
@@ -959,5 +959,17 @@
 /* syscall: "netbsd32_fremovexattr" ret: "int" args: "int" "const netbsd32_charp" */
 #define	netbsd32_SYS_netbsd32_fremovexattr	386
 
-#define	netbsd32_SYS_MAXSYSCALL	387
+/* syscall: "__stat30" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
+#define	netbsd32_SYS___stat30	387
+
+/* syscall: "__fstat30" ret: "int" args: "int" "netbsd32_statp_t" */
+#define	netbsd32_SYS___fstat30	388
+
+/* syscall: "__lstat30" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
+#define	netbsd32_SYS___lstat30	389
+
+/* syscall: "__getdents30" ret: "int" args: "int" "netbsd32_charp" "netbsd32_size_t" */
+#define	netbsd32_SYS___getdents30	390
+
+#define	netbsd32_SYS_MAXSYSCALL	391
 #define	netbsd32_SYS_NSYSENT	512
diff --git a/sys/compat/netbsd32/netbsd32_syscallargs.h b/sys/compat/netbsd32/netbsd32_syscallargs.h
index 9b07e3726025..d6969f7287da 100644
--- a/sys/compat/netbsd32/netbsd32_syscallargs.h
+++ b/sys/compat/netbsd32/netbsd32_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.44 2005/07/23 22:04:12 cube Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.45 2005/08/19 04:24:38 christos Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.37 2005/07/23 22:03:45 cube Exp
+ * created from	NetBSD: syscalls.master,v 1.38 2005/08/19 02:03:57 christos Exp
  */
 
 #ifndef _netbsd32_SYS__SYSCALLARGS_H_
@@ -1148,17 +1148,17 @@ struct netbsd32___msync13_args {
 
 struct netbsd32___stat13_args {
 	syscallarg(const netbsd32_charp) path;
-	syscallarg(netbsd32_statp_t) ub;
+	syscallarg(netbsd32_stat13p_t) ub;
 };
 
 struct netbsd32___fstat13_args {
 	syscallarg(int) fd;
-	syscallarg(netbsd32_statp_t) sb;
+	syscallarg(netbsd32_stat13p_t) sb;
 };
 
 struct netbsd32___lstat13_args {
 	syscallarg(const netbsd32_charp) path;
-	syscallarg(netbsd32_statp_t) ub;
+	syscallarg(netbsd32_stat13p_t) ub;
 };
 
 struct netbsd32___sigaltstack14_args {
@@ -1555,6 +1555,27 @@ struct netbsd32_fremovexattr_args {
 	syscallarg(const netbsd32_charp) name;
 };
 
+struct netbsd32_sys___stat30_args {
+	syscallarg(const netbsd32_charp) path;
+	syscallarg(netbsd32_statp_t) ub;
+};
+
+struct netbsd32_sys___fstat30_args {
+	syscallarg(int) fd;
+	syscallarg(netbsd32_statp_t) sb;
+};
+
+struct netbsd32_sys___lstat30_args {
+	syscallarg(const netbsd32_charp) path;
+	syscallarg(netbsd32_statp_t) ub;
+};
+
+struct netbsd32_sys___getdents30_args {
+	syscallarg(int) fd;
+	syscallarg(netbsd32_charp) buf;
+	syscallarg(netbsd32_size_t) count;
+};
+
 /*
  * System call prototypes.
  */
@@ -2177,4 +2198,12 @@ int	netbsd32_lremovexattr(struct lwp *, void *, register_t *);
 
 int	netbsd32_fremovexattr(struct lwp *, void *, register_t *);
 
+int	netbsd32_sys___stat30(struct lwp *, void *, register_t *);
+
+int	netbsd32_sys___fstat30(struct lwp *, void *, register_t *);
+
+int	netbsd32_sys___lstat30(struct lwp *, void *, register_t *);
+
+int	netbsd32_sys___getdents30(struct lwp *, void *, register_t *);
+
 #endif /* _netbsd32_SYS__SYSCALLARGS_H_ */
diff --git a/sys/compat/netbsd32/netbsd32_syscalls.c b/sys/compat/netbsd32/netbsd32_syscalls.c
index bd0dd7f55c0c..36dcb9b47240 100644
--- a/sys/compat/netbsd32/netbsd32_syscalls.c
+++ b/sys/compat/netbsd32/netbsd32_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.44 2005/07/23 22:04:12 cube Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.45 2005/08/19 04:24:38 christos Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.37 2005/07/23 22:03:45 cube Exp
+ * created from	NetBSD: syscalls.master,v 1.38 2005/08/19 02:03:57 christos Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.44 2005/07/23 22:04:12 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.45 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -513,4 +513,8 @@ const char *const netbsd32_syscallnames[] = {
 	"netbsd32_removexattr",			/* 384 = netbsd32_removexattr */
 	"netbsd32_lremovexattr",			/* 385 = netbsd32_lremovexattr */
 	"netbsd32_fremovexattr",			/* 386 = netbsd32_fremovexattr */
+	"__stat30",			/* 387 = __stat30 */
+	"__fstat30",			/* 388 = __fstat30 */
+	"__lstat30",			/* 389 = __lstat30 */
+	"__getdents30",			/* 390 = __getdents30 */
 };
diff --git a/sys/compat/netbsd32/netbsd32_sysctl.c b/sys/compat/netbsd32/netbsd32_sysctl.c
index 3d64e5a24890..3975b2be4de6 100644
--- a/sys/compat/netbsd32/netbsd32_sysctl.c
+++ b/sys/compat/netbsd32/netbsd32_sysctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_sysctl.c,v 1.19 2005/07/03 17:18:02 cube Exp $	*/
+/*	$NetBSD: netbsd32_sysctl.c,v 1.20 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.19 2005/07/03 17:18:02 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.20 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.19 2005/07/03 17:18:02 cube Ex
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/dirent.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/compat/netbsd32/netbsd32_sysent.c b/sys/compat/netbsd32/netbsd32_sysent.c
index eb6d9480e2cc..5f0b6316b52c 100644
--- a/sys/compat/netbsd32/netbsd32_sysent.c
+++ b/sys/compat/netbsd32/netbsd32_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.44 2005/07/23 22:04:12 cube Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.45 2005/08/19 04:24:38 christos Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.37 2005/07/23 22:03:45 cube Exp
+ * created from	NetBSD: syscalls.master,v 1.38 2005/08/19 02:03:57 christos Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.44 2005/07/23 22:04:12 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.45 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -1000,14 +1000,14 @@ struct sysent netbsd32_sysent[] = {
 	    netbsd32_lremovexattr },		/* 385 = netbsd32_lremovexattr */
 	{ 2, s(struct netbsd32_fremovexattr_args), 0,
 	    netbsd32_fremovexattr },		/* 386 = netbsd32_fremovexattr */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 387 = filler */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 388 = filler */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 389 = filler */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 390 = filler */
+	{ 2, s(struct netbsd32_sys___stat30_args), 0,
+	    netbsd32_sys___stat30 },		/* 387 = __stat30 */
+	{ 2, s(struct netbsd32_sys___fstat30_args), 0,
+	    netbsd32_sys___fstat30 },		/* 388 = __fstat30 */
+	{ 2, s(struct netbsd32_sys___lstat30_args), 0,
+	    netbsd32_sys___lstat30 },		/* 389 = __lstat30 */
+	{ 3, s(struct netbsd32_sys___getdents30_args), 0,
+	    netbsd32_sys___getdents30 },	/* 390 = __getdents30 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 391 = filler */
 	{ 0, 0, 0,
diff --git a/sys/compat/netbsd32/netbsd32_time.c b/sys/compat/netbsd32/netbsd32_time.c
index 64e6df5d6d55..3556ecda556c 100644
--- a/sys/compat/netbsd32/netbsd32_time.c
+++ b/sys/compat/netbsd32/netbsd32_time.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_time.c,v 1.11 2005/07/23 18:56:15 cube Exp $	*/
+/*	$NetBSD: netbsd32_time.c,v 1.12 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.11 2005/07/23 18:56:15 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.12 2005/08/19 04:24:38 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.11 2005/07/23 18:56:15 cube Exp
 #include <sys/proc.h>
 #include <sys/pool.h>
 #include <sys/resourcevar.h>
+#include <sys/dirent.h>
 
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
diff --git a/sys/compat/netbsd32/netbsd32_wait.c b/sys/compat/netbsd32/netbsd32_wait.c
index 82c6e7739ebf..9b046f78138d 100644
--- a/sys/compat/netbsd32/netbsd32_wait.c
+++ b/sys/compat/netbsd32/netbsd32_wait.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_wait.c,v 1.8 2005/07/22 22:46:29 cube Exp $	*/
+/*	$NetBSD: netbsd32_wait.c,v 1.9 2005/08/19 04:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.8 2005/07/22 22:46:29 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.9 2005/08/19 04:24:38 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.8 2005/07/22 22:46:29 cube Exp $
 #include <sys/vnode.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
+#include <sys/dirent.h>
 
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
diff --git a/sys/compat/netbsd32/syscalls.master b/sys/compat/netbsd32/syscalls.master
index c681d61841de..fe64635be6ac 100644
--- a/sys/compat/netbsd32/syscalls.master
+++ b/sys/compat/netbsd32/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.38 2005/08/19 02:03:57 christos Exp $
+	$NetBSD: syscalls.master,v 1.39 2005/08/19 04:24:38 christos Exp $
 
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -443,9 +443,9 @@
 275	STD		{ int netbsd32_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
 276	STD		{ int netbsd32_lutimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
 277	STD		{ int netbsd32___msync13(netbsd32_voidp addr, netbsd32_size_t len, int flags); }
-278	STD		{ int netbsd32___stat13(const netbsd32_charp path, netbsd32_stat30p_t ub); }
-279	STD		{ int netbsd32___fstat13(int fd, netbsd32_stat30p_t sb); }
-280	STD		{ int netbsd32___lstat13(const netbsd32_charp path, netbsd32_stat30p_t ub); }
+278	STD		{ int netbsd32___stat13(const netbsd32_charp path, netbsd32_stat13p_t ub); }
+279	STD		{ int netbsd32___fstat13(int fd, netbsd32_stat13p_t sb); }
+280	STD		{ int netbsd32___lstat13(const netbsd32_charp path, netbsd32_stat13p_t ub); }
 281	STD		{ int netbsd32___sigaltstack14(const netbsd32_sigaltstackp_t nss, netbsd32_sigaltstackp_t oss); }
 282	NOARGS		{ int sys___vfork14(void); }
 283	STD		{ int netbsd32___posix_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
@@ -646,4 +646,4 @@
 389     STD             { int netbsd32_sys___lstat30( \
 			    const netbsd32_charp path, netbsd32_statp_t ub); }
 390     STD             { int netbsd32_sys___getdents30(int fd, \
-			    netbsd32_charp buf, netbsd32_size_t count);
+			    netbsd32_charp buf, netbsd32_size_t count); }