Include the MIG-generated server header files

This enables the compiler to check that the server function
declarations match MIGs expectations.  Fix a few oddities along the
way.

* console-client/trans.c: Include MIG-generated server header file(s).
* console/console.c: Likewise.  Also, fix declarations.
* console/mutations.h (TIOCTL_IMPORTS): Just use libnetfs/priv.h.
* console/priv.h: Delete now unused file.
* ext2fs/storeinfo.c: Include MIG-generated server header file(s).
* fatfs/inode.c: Likewise.
* fatfs/main.c: Likewise.  Also, fix declaration.
* isofs/inode.c: Likewise.
* libdiskfs/boot-start.c: Likewise.
* libdiskfs/file-chg.c: Include the correct MIG-generated server header file.
* libdiskfs/file-chmod.c: Include MIG-generated server header file(s).
* libdiskfs/file-get-fs-opts.c: Likewise.
* libdiskfs/init-startup.c: Likewise.
* libnetfs/file-get-children.c: Likewise.
* libnetfs/file-getcontrol.c: Include the correct MIG-generated server
header file.
* libnetfs/file-set-translator.c: Include MIG-generated server header file(s).
* libnetfs/fsstubs.c: Likewise.
* libtrivfs/file-access.c: Likewise.
* libtrivfs/file-chauthor.c: Likewise.
* libtrivfs/file-chflags.c: Likewise.
* libtrivfs/file-chg.c: Likewise.
* libtrivfs/file-chmod.c: Likewise.
* libtrivfs/file-chown.c: Likewise.
* libtrivfs/file-exec.c: Likewise.
* libtrivfs/file-get-children.c: Likewise.
* libtrivfs/file-get-fs-options.c: Likewise.
* libtrivfs/file-get-source.c: Likewise.
* libtrivfs/file-get-storage-info.c: Likewise.
* libtrivfs/file-get-trans.c: Likewise.
* libtrivfs/file-get-transcntl.c: Likewise.
* libtrivfs/file-getcontrol.c: Likewise.
* libtrivfs/file-getfh.c: Likewise.
* libtrivfs/file-getlinknode.c: Likewise.
* libtrivfs/file-lock.c: Likewise.
* libtrivfs/file-reparent.c: Likewise.
* libtrivfs/file-set-size.c: Likewise.
* libtrivfs/file-set-trans.c: Likewise.
* libtrivfs/file-statfs.c: Likewise.
* libtrivfs/file-sync.c: Likewise.
* libtrivfs/file-syncfs.c: Likewise.
* libtrivfs/file-utimes.c: Likewise.
* libtrivfs/fsys-forward.c: Likewise.
* libtrivfs/fsys-get-options.c: Likewise.
* libtrivfs/fsys-getroot.c: Likewise.
* libtrivfs/fsys-goaway.c: Likewise.
* libtrivfs/fsys-set-options.c: Likewise.
* libtrivfs/fsys-stubs.c: Likewise.
* libtrivfs/fsys-syncfs.c: Likewise.
* libtrivfs/io-async-icky.c: Likewise.
* libtrivfs/io-async.c: Likewise.
* libtrivfs/io-duplicate.c: Likewise.
* libtrivfs/io-identity.c: Likewise.
* libtrivfs/io-map.c: Likewise.
* libtrivfs/io-modes-get.c: Likewise.
* libtrivfs/io-modes-off.c: Likewise.
* libtrivfs/io-modes-on.c: Likewise.
* libtrivfs/io-modes-set.c: Likewise.
* libtrivfs/io-owner-get.c: Likewise.
* libtrivfs/io-owner-mod.c: Likewise.
* libtrivfs/io-pathconf.c: Likewise.
* libtrivfs/io-read.c: Likewise.
* libtrivfs/io-readable.c: Likewise.
* libtrivfs/io-reauthenticate.c: Likewise.
* libtrivfs/io-restrict-auth.c: Likewise.
* libtrivfs/io-revoke.c: Likewise.
* libtrivfs/io-seek.c: Likewise.
* libtrivfs/io-select.c: Likewise.
* libtrivfs/io-stat.c: Likewise.
* libtrivfs/io-stubs.c: Likewise.
* libtrivfs/io-version.c: Likewise.
* libtrivfs/io-write.c: Likewise.
* pfinet/tunnel.c: Likewise.
* storeio/io.c: Likewise.
* storeio/storeio.c: Likewise.
* term/users.c: Likewise.
* tmpfs/node.c: Likewise.
* trans/fakeroot.c: Likewise.  Also, include all server headers that provide
the X_server_routine functions...
(netfs_demuxer): ... that were previously declared here.
* trans/fifo.c: Include MIG-generated server header file(s).
* trans/firmlink.c: Likewise.
* trans/hello-mt.c: Likewise.
* trans/hello.c: Likewise.
* trans/magic.c: Likewise.
* trans/mtab.c: Likewise.
* trans/new-fifo.c: Likewise.
* trans/null.c: Likewise.
* trans/proxy-defpager.c: Likewise.
* trans/streamio.c: Likewise.
* libdiskfs/fsmutations.h: Qualify the import with the libraries path.
Without this change, out-of-tree builds would no longer work.
* libnetfs/mutations.h: Likewise.
* libtrivfs/mig-mutate.h: Likewise.

11 files changed, 29 insertions, 6 deletions

diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index c519180c..987af243 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -31,6 +31,12 @@
 
 #include <version.h>
 
+#include "libnetfs/fs_S.h"
+#include "libnetfs/io_S.h"
+#include "libnetfs/fsys_S.h"
+#include "libports/notify_S.h"
+#include "libports/interrupt_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (fakeroot);
 
 char *netfs_server_name = "fakeroot";
@@ -934,12 +940,6 @@ int
 netfs_demuxer (mach_msg_header_t *inp,
 	       mach_msg_header_t *outp)
 {
-  mig_routine_t netfs_io_server_routine (mach_msg_header_t *);
-  mig_routine_t netfs_fs_server_routine (mach_msg_header_t *);
-  mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
-  mig_routine_t netfs_fsys_server_routine (mach_msg_header_t *);
-  mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
-
   mig_routine_t routine;
   if ((routine = netfs_io_server_routine (inp)) ||
       (routine = netfs_fs_server_routine (inp)) ||
diff --git a/trans/fifo.c b/trans/fifo.c
index e6fbd0e9..a9ad2dd2 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -35,6 +35,9 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 /* Global options.  These defaults are the standard ones, I think...   */
 int wait_for_reader = 1, wait_for_writer = 1;
 int one_reader = 1;
diff --git a/trans/firmlink.c b/trans/firmlink.c
index 9c063c04..69d4aaed 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -32,6 +32,8 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (firmlink);
 
 static const struct argp_option options[] =
diff --git a/trans/hello-mt.c b/trans/hello-mt.c
index c2d4cc99..ba9329a7 100644
--- a/trans/hello-mt.c
+++ b/trans/hello-mt.c
@@ -30,6 +30,8 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (hello-mt);
 
 /* The message we return when we are read.  */
diff --git a/trans/hello.c b/trans/hello.c
index c49feeb2..4e88c609 100644
--- a/trans/hello.c
+++ b/trans/hello.c
@@ -29,6 +29,8 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (hello);
 
 /* The message we return when we are read.  */
diff --git a/trans/magic.c b/trans/magic.c
index 1a8427ce..58084838 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -35,6 +35,8 @@
 #include <argp.h>
 #include <argz.h>
 #include <assert.h>
+
+#include "fsys_S.h"
 
 const char *argp_program_version = STANDARD_HURD_VERSION (magic);
 
diff --git a/trans/mtab.c b/trans/mtab.c
index da83e6fc..8c9f8d3b 100644
--- a/trans/mtab.c
+++ b/trans/mtab.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
 #include "fs_U.h"
 
 static char *target_path = NULL;
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index dc3cc79e..e71c95ca 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -38,6 +38,10 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_fsys_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 #define DEFAULT_SERVER _SERVERS "fifo";
 
 const char *argp_program_version = STANDARD_HURD_VERSION (new-fifo);
diff --git a/trans/null.c b/trans/null.c
index 4828cce3..bd082dc8 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -32,6 +32,9 @@
 #include <limits.h>
 #include <argp.h>
 #include <nullauth.h>
+
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
 
 const char *argp_program_version = STANDARD_HURD_VERSION (null);
 
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 0a5ab65e..98176577 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -24,6 +24,7 @@
 #include <version.h>
 #include <hurd/paths.h>
 
+#include "libtrivfs/trivfs_io_S.h"
 #include "default_pager_S.h"
 #include "default_pager_U.h"
 
diff --git a/trans/streamio.c b/trans/streamio.c
index 68badd21..54627b73 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -34,6 +34,9 @@
 #include <hurd/trivfs.h>
 #include <version.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 /* The global lock */
 pthread_mutex_t global_lock;