23 files changed, 38 insertions, 148 deletions
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index f9ecd91..da7c5e2 100644
--- a/sys/compat/svr4/svr4.h
+++ b/sys/compat/svr4/svr4.h
@@ -40,4 +40,15 @@ extern struct sysentvec svr4_sysvec;
 #define COMPAT_SVR4_SOLARIS2
 #define KTRACE
 
+/* These are currently unimplemented (see svr4_ipc.c) */
+#if defined(SYSVMSG)
+# undef SYSVMSG
+#endif
+#if defined(SYSVSHM)
+# undef SYSVSHM
+#endif
+#if defined(SYSVSEM)
+# undef SYSVSEM
+#endif
+
 #endif
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index c3e56f9..d9571c3 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -33,13 +33,9 @@
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filio.h>
-#include <sys/fcntl.h>
 #include <sys/signal.h>
 #include <sys/filedesc.h>
-#include <sys/termios.h>
 #include <sys/poll.h>
-#include <sys/socket.h>
-#include <net/if.h>
 #include <sys/malloc.h>
 
 #include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 866f80b..2891694 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -33,12 +33,9 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
-#include <sys/termios.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
-#include <net/if.h>
-
 
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 67bafae..7d97a24 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -63,8 +63,6 @@
 
 #include <sys/sysproto.h>
 
-#include <netinet/in.h>
-
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
 #include <svr4/svr4_signal.h>
@@ -73,7 +71,6 @@
 #include <svr4/svr4_sysconfig.h>
 #include <svr4/svr4_dirent.h>
 #include <svr4/svr4_acl.h>
-#include <svr4/svr4_time.h>
 #include <svr4/svr4_ulimit.h>
 #include <svr4/svr4_statvfs.h>
 #include <svr4/svr4_hrt.h>
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index ee8dfd6..125c0c5 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index ea172e9..1884b07 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -43,7 +43,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/file.h>
@@ -111,31 +110,10 @@ svr4_find_socket(p, fp, dev, ino)
 }
 
 
-void
-svr4_delete_socket(p, fp)
-	struct proc *p;
-	struct file *fp;
-{
-	struct svr4_sockcache_entry *e;
-	void *cookie = ((struct socket *) fp->f_data)->so_emuldata;
-
-	if (!svr4_str_initialized) {
-		TAILQ_INIT(&svr4_head);
-		svr4_str_initialized = 1;
-		return;
-	}
-
-	for (e = svr4_head.tqh_first; e != NULL; e = e->entries.tqe_next)
-		if (e->p == p && e->cookie == cookie) {
-			TAILQ_REMOVE(&svr4_head, e, entries);
-			DPRINTF(("svr4_delete_socket: %s [%p,%d,%d]\n",
-				 e->sock.sun_path, p, e->dev, e->ino));
-			free(e, M_TEMP);
-			return;
-		}
-}
-
-
+/*
+ * svr4_delete_socket() is in sys/dev/streams.c (because it's called by
+ * the streams "soo_close()" routine).
+ */
 int
 svr4_add_socket(p, path, st)
 	struct proc *p;
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index d4f4505..5b99ae9 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -34,17 +34,12 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/sockio.h>
-#include <sys/termios.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
 
 #include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
 #include <svr4/svr4_ioctl.h>
 #include <svr4/svr4_sockio.h>
 
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index f1d8c40..8884116 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -31,19 +31,18 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/unistd.h>
-
 #include <sys/time.h>
-#include <vm/vm.h>
 #include <sys/sysctl.h>
-#include <netinet/in.h>
-
 #include <sys/sysproto.h>
 
+#include <vm/vm.h>
+
+#include <netinet/in.h>
+
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
 #include <svr4/svr4_signal.h>
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 5399041..d495cc6 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -40,7 +40,6 @@
 #define COMPAT_43 1
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
@@ -52,7 +51,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/un.h>
-#include <net/if.h>
 #include <netinet/in.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index 12d533b..9b9f0e4 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -33,27 +33,15 @@
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/fcntl.h>
-#include <sys/unistd.h>
 #include <sys/termios.h>
-#include <sys/tty.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
-#include <net/if.h>
-#include <sys/malloc.h>
 
 #include <sys/sysproto.h>
 
 #include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
 #include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
 #include <svr4/svr4_termios.h>
 
-
 #ifndef __CONCAT3
 # if __STDC__
 #  define __CONCAT3(a,b,c)	a ## b ## c
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 8ce2c81..7684487 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -33,18 +33,11 @@
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/fcntl.h>
 #include <sys/ioctl_compat.h>
 #include <sys/termios.h>
-#include <sys/socket.h>
-#include <net/if.h>
 
 #include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
 #include <svr4/svr4_ttold.h>
 #include <svr4/svr4_ioctl.h>
 
diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c
index f580ebf..bd44470 100644
--- a/sys/i386/svr4/svr4_machdep.c
+++ b/sys/i386/svr4/svr4_machdep.c
@@ -31,25 +31,14 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/lock.h>
 #include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <vm/vm_map.h>
-#include <vm/vm_extern.h>
-#include <sys/user.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
-#include <sys/sysproto.h>
-#include <sys/elf32.h>
 
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
@@ -67,7 +56,6 @@
 #include <svr4/svr4_ucontext.h>
 #include <svr4/svr4_proto.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_exec.h>
 
 #undef sigcode
 #undef szsigcode
diff --git a/sys/svr4/svr4.h b/sys/svr4/svr4.h
index f9ecd91..da7c5e2 100644
--- a/sys/svr4/svr4.h
+++ b/sys/svr4/svr4.h
@@ -40,4 +40,15 @@ extern struct sysentvec svr4_sysvec;
 #define COMPAT_SVR4_SOLARIS2
 #define KTRACE
 
+/* These are currently unimplemented (see svr4_ipc.c) */
+#if defined(SYSVMSG)
+# undef SYSVMSG
+#endif
+#if defined(SYSVSHM)
+# undef SYSVSHM
+#endif
+#if defined(SYSVSEM)
+# undef SYSVSEM
+#endif
+
 #endif
diff --git a/sys/svr4/svr4_filio.c b/sys/svr4/svr4_filio.c
index c3e56f9..d9571c3 100644
--- a/sys/svr4/svr4_filio.c
+++ b/sys/svr4/svr4_filio.c
@@ -33,13 +33,9 @@
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filio.h>
-#include <sys/fcntl.h>
 #include <sys/signal.h>
 #include <sys/filedesc.h>
-#include <sys/termios.h>
 #include <sys/poll.h>
-#include <sys/socket.h>
-#include <net/if.h>
 #include <sys/malloc.h>
 
 #include <sys/sysproto.h>
diff --git a/sys/svr4/svr4_ioctl.c b/sys/svr4/svr4_ioctl.c
index 866f80b..2891694 100644
--- a/sys/svr4/svr4_ioctl.c
+++ b/sys/svr4/svr4_ioctl.c
@@ -33,12 +33,9 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
-#include <sys/termios.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
-#include <net/if.h>
-
 
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
diff --git a/sys/svr4/svr4_misc.c b/sys/svr4/svr4_misc.c
index 67bafae..7d97a24 100644
--- a/sys/svr4/svr4_misc.c
+++ b/sys/svr4/svr4_misc.c
@@ -63,8 +63,6 @@
 
 #include <sys/sysproto.h>
 
-#include <netinet/in.h>
-
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
 #include <svr4/svr4_signal.h>
@@ -73,7 +71,6 @@
 #include <svr4/svr4_sysconfig.h>
 #include <svr4/svr4_dirent.h>
 #include <svr4/svr4_acl.h>
-#include <svr4/svr4_time.h>
 #include <svr4/svr4_ulimit.h>
 #include <svr4/svr4_statvfs.h>
 #include <svr4/svr4_hrt.h>
diff --git a/sys/svr4/svr4_signal.c b/sys/svr4/svr4_signal.c
index ee8dfd6..125c0c5 100644
--- a/sys/svr4/svr4_signal.c
+++ b/sys/svr4/svr4_signal.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>
diff --git a/sys/svr4/svr4_socket.c b/sys/svr4/svr4_socket.c
index ea172e9..1884b07 100644
--- a/sys/svr4/svr4_socket.c
+++ b/sys/svr4/svr4_socket.c
@@ -43,7 +43,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/file.h>
@@ -111,31 +110,10 @@ svr4_find_socket(p, fp, dev, ino)
 }
 
 
-void
-svr4_delete_socket(p, fp)
-	struct proc *p;
-	struct file *fp;
-{
-	struct svr4_sockcache_entry *e;
-	void *cookie = ((struct socket *) fp->f_data)->so_emuldata;
-
-	if (!svr4_str_initialized) {
-		TAILQ_INIT(&svr4_head);
-		svr4_str_initialized = 1;
-		return;
-	}
-
-	for (e = svr4_head.tqh_first; e != NULL; e = e->entries.tqe_next)
-		if (e->p == p && e->cookie == cookie) {
-			TAILQ_REMOVE(&svr4_head, e, entries);
-			DPRINTF(("svr4_delete_socket: %s [%p,%d,%d]\n",
-				 e->sock.sun_path, p, e->dev, e->ino));
-			free(e, M_TEMP);
-			return;
-		}
-}
-
-
+/*
+ * svr4_delete_socket() is in sys/dev/streams.c (because it's called by
+ * the streams "soo_close()" routine).
+ */
 int
 svr4_add_socket(p, path, st)
 	struct proc *p;
diff --git a/sys/svr4/svr4_sockio.c b/sys/svr4/svr4_sockio.c
index d4f4505..5b99ae9 100644
--- a/sys/svr4/svr4_sockio.c
+++ b/sys/svr4/svr4_sockio.c
@@ -34,17 +34,12 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/sockio.h>
-#include <sys/termios.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
 
 #include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
 #include <svr4/svr4_ioctl.h>
 #include <svr4/svr4_sockio.h>
 
diff --git a/sys/svr4/svr4_stat.c b/sys/svr4/svr4_stat.c
index f1d8c40..8884116 100644
--- a/sys/svr4/svr4_stat.c
+++ b/sys/svr4/svr4_stat.c
@@ -31,19 +31,18 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/unistd.h>
-
 #include <sys/time.h>
-#include <vm/vm.h>
 #include <sys/sysctl.h>
-#include <netinet/in.h>
-
 #include <sys/sysproto.h>
 
+#include <vm/vm.h>
+
+#include <netinet/in.h>
+
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
 #include <svr4/svr4_signal.h>
diff --git a/sys/svr4/svr4_stream.c b/sys/svr4/svr4_stream.c
index 5399041..d495cc6 100644
--- a/sys/svr4/svr4_stream.c
+++ b/sys/svr4/svr4_stream.c
@@ -40,7 +40,6 @@
 #define COMPAT_43 1
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
@@ -52,7 +51,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/un.h>
-#include <net/if.h>
 #include <netinet/in.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/sys/svr4/svr4_termios.c b/sys/svr4/svr4_termios.c
index 12d533b..9b9f0e4 100644
--- a/sys/svr4/svr4_termios.c
+++ b/sys/svr4/svr4_termios.c
@@ -33,27 +33,15 @@
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/fcntl.h>
-#include <sys/unistd.h>
 #include <sys/termios.h>
-#include <sys/tty.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
-#include <net/if.h>
-#include <sys/malloc.h>
 
 #include <sys/sysproto.h>
 
 #include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
 #include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
 #include <svr4/svr4_termios.h>
 
-
 #ifndef __CONCAT3
 # if __STDC__
 #  define __CONCAT3(a,b,c)	a ## b ## c
diff --git a/sys/svr4/svr4_ttold.c b/sys/svr4/svr4_ttold.c
index 8ce2c81..7684487 100644
--- a/sys/svr4/svr4_ttold.c
+++ b/sys/svr4/svr4_ttold.c
@@ -33,18 +33,11 @@
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/fcntl.h>
 #include <sys/ioctl_compat.h>
 #include <sys/termios.h>
-#include <sys/socket.h>
-#include <net/if.h>
 
 #include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
 #include <svr4/svr4_ttold.h>
 #include <svr4/svr4_ioctl.h>