From 8c500585354f76796f7f8dbc12cfa17806f867b4 Mon Sep 17 00:00:00 2001
From: glass <glass@NetBSD.org>
Date: Wed, 22 Jun 1994 03:37:15 +0000
Subject: [PATCH] update for getdtablesize change, and track compat_sunos

---
 sys/compat/ultrix/syscalls.master |  4 ++--
 sys/compat/ultrix/ultrix_misc.c   | 39 ++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/sys/compat/ultrix/syscalls.master b/sys/compat/ultrix/syscalls.master
index a96fe06ab3ac..426c2e4e9d92 100644
--- a/sys/compat/ultrix/syscalls.master
+++ b/sys/compat/ultrix/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.2 1994/06/15 05:18:07 glass Exp $
+	$Id: syscalls.master,v 1.3 1994/06/22 03:37:15 glass Exp $
 ;	from: @(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from SunOS).
 ; Processed to created sun_sysent.c, sun_syscalls.c and sun_syscall.h.
@@ -109,7 +109,7 @@
 86	STD	2 getitimer
 87	STD	2 ogethostname
 88	STD	2 osethostname
-89	STD	0 getdtablesize
+89	STD	0 ogetdtablesize
 90	STD	2 dup2
 91	UNIMPL	2 getdopt
 92	STD	3 fcntl
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index 1fc2d9579096..e9c5bfb9138e 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -42,7 +42,7 @@
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
  * from: Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp 
- * $Id: ultrix_misc.c,v 1.2 1994/06/15 05:18:10 glass Exp $
+ * $Id: ultrix_misc.c,v 1.3 1994/06/22 03:37:17 glass Exp $
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
-#include <ufs/dir.h>
+#include <sys/dir.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -82,6 +82,10 @@
 
 #include <miscfs/specfs/specdev.h>
 
+#include <nfs/rpcv2.h>
+#include <nfs/nfsv2.h>
+#include <nfs/nfs.h>
+
 #include <vm/vm.h>
 
 struct ultrix_waitpid_args {
@@ -301,6 +305,22 @@ sun_mount(p, uap, retval)
 	return (mount(p, uap, retval));
 }
 
+#if defined(NFSCLIENT)
+async_daemon(p, uap, retval)
+      struct proc *p;
+      void *uap;
+      int *retval;
+{
+      struct nfssvc_args {
+              int flag;
+              caddr_t argp;
+      } args;
+
+      args.flag = NFSSVC_BIOD;
+      return nfssvc(p, &args, retval);
+}
+#endif /* NFSCLIENT */
+
 struct sun_sigpending_args {
 	int	*mask;
 };
@@ -391,7 +411,8 @@ again:
 	 * First we read into the malloc'ed buffer, then
 	 * we massage it into user space, one record at a time.
 	 */
-	if (error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, 0))
+	if (error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, (u_long *)0,
+	    0))
 		goto out;
 	inp = buf;
 	outp = uap->buf;
@@ -833,20 +854,16 @@ sun_statfs(p, uap, retval)
 	int *retval;
 {
 	register struct mount *mp;
-	register struct nameidata *ndp;
 	register struct statfs *sp;
 	int error;
 	struct nameidata nd;
 
-	ndp = &nd;
-	ndp->ni_nameiop = LOOKUP | FOLLOW;
-	ndp->ni_segflg = UIO_USERSPACE;
-	ndp->ni_dirp = uap->path;
-	if (error = namei(ndp, p))
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, p);
+	if (error = namei(&nd))
 		return (error);
-	mp = ndp->ni_vp->v_mount;
+	mp = nd.ni_vp->v_mount;
 	sp = &mp->mnt_stat;
-	vrele(ndp->ni_vp);
+	vrele(nd.ni_vp);
 	if (error = VFS_STATFS(mp, sp, p))
 		return (error);
 	sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;