2002-08-06 Roland McGrath <roland@frob.com>

	* proxy-defpager.c: Rename all the server functions with S_ prefix.
	Include "default_pager_U.h" for client stub prototypes.
	* Makefile (default_pager-MIGCOMSFLAGS): New variable, give -prefix S_.
	(OBJS): Add default_pagerUser.o here.
	(proxy-defpager): Depend on it.

2 files changed, 35 insertions, 26 deletions

diff --git a/trans/Makefile b/trans/Makefile
index 1fc07a3a..3f210fe4 100644
--- a/trans/Makefile
+++ b/trans/Makefile
@@ -19,18 +19,23 @@ dir := trans
 makemode := servers
 
 targets = symlink firmlink ifsock magic null fifo new-fifo fwd crash \
-	  password hello hello-mt streamio fakeroot proxy-defpager
+	  password hello hello-mt streamio fakeroot proxy-defpager devpts
 SRCS = ifsock.c symlink.c magic.c null.c fifo.c new-fifo.c fwd.c \
 	crash.c firmlink.c password.c hello.c hello-mt.c streamio.c \
-	fakeroot.c proxy-defpager.c
+	fakeroot.c proxy-defpager.c devpts.c
 OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o \
 	crashServer.o crash_replyUser.o msgServer.o \
-	default_pagerServer.o device_replyServer.o elfcore.o
+	default_pagerServer.o default_pagerUser.o \
+	device_replyServer.o elfcore.o
 HURDLIBS = threads ports trivfs fshelp pipe ihash shouldbeinlibc
 password-LDLIBS = $(LIBCRYPT)
 
 include ../Makeconf
 
+# hurd/default_pager.defs doesn't include hurd/hurd_types.defs and so won't
+# obey SERVERPREFIX.
+default_pager-MIGCOMSFLAGS = -prefix S_
+
 vpath elfcore.c $(top_srcdir)/exec
 
 symlink: fsysServer.o
@@ -38,7 +43,7 @@ ifsock: ifsockServer.o
 crash: crashServer.o crash_replyUser.o msgServer.o elfcore.o
 password: passwordServer.o
 streamio: device_replyServer.o
-proxy-defpager: default_pagerServer.o
+proxy-defpager: default_pagerServer.o default_pagerUser.o
 
 proxy-defpager crash password streamio: ../libthreads/libthreads.a ../libports/libports.a ../libtrivfs/libtrivfs.a ../libthreads/libthreads.a ../libfshelp/libfshelp.a
 fifo new-fifo: ../libpipe/libpipe.a
@@ -48,4 +53,7 @@ hello: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a
 fakeroot: ../libnetfs/libnetfs.a ../libfshelp/libfshelp.a ../libiohelp/libiohelp.a ../libthreads/libthreads.a ../libports/libports.a ../libihash/libihash.a
 $(targets): ../libshouldbeinlibc/libshouldbeinlibc.a
 
+devpts: ../libtermios/libtermserver.a ../libnetfs/libnetfs.a ../libfshelp/libfshelp.a ../libiohelp/libiohelp.a ../libthreads/libthreads.a ../libports/libports.a ../libihash/libihash.a
+
+
 $(targets): %: %.o
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 24671c81..73214763 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -25,6 +25,7 @@
 #include <hurd/paths.h>
 
 #include "default_pager_S.h"
+#include "default_pager_U.h"
 
 static mach_port_t real_defpager, dev_master;
 
@@ -41,27 +42,27 @@ allowed (mach_port_t port, int mode)
 }
 
 kern_return_t
-default_pager_object_create (mach_port_t default_pager,
-			     memory_object_t *memory_object,
-			     vm_size_t object_size)
+S_default_pager_object_create (mach_port_t default_pager,
+			       memory_object_t *memory_object,
+			       vm_size_t object_size)
 {
   return allowed (default_pager, O_EXEC)
     ?: default_pager_object_create (real_defpager, memory_object, object_size);
 }
 
 kern_return_t
-default_pager_info (mach_port_t default_pager, default_pager_info_t *info)
+S_default_pager_info (mach_port_t default_pager, default_pager_info_t *info)
 {
   return allowed (default_pager, O_READ)
     ?: default_pager_info (real_defpager, info);
 }
 
 kern_return_t
-default_pager_objects (mach_port_t default_pager,
-		       default_pager_object_array_t *objects,
-		       mach_msg_type_number_t *objectsCnt,
-		       mach_port_array_t *ports,
-		       mach_msg_type_number_t *portsCnt)
+S_default_pager_objects (mach_port_t default_pager,
+			 default_pager_object_array_t *objects,
+			 mach_msg_type_number_t *objectsCnt,
+			 mach_port_array_t *ports,
+			 mach_msg_type_number_t *portsCnt)
 {
   return allowed (default_pager, O_WRITE)
     ?: default_pager_objects (real_defpager,
@@ -69,10 +70,10 @@ default_pager_objects (mach_port_t default_pager,
 }
 
 kern_return_t
-default_pager_paging_file (mach_port_t default_pager,
-			   mach_port_t master_device_port,
-			   default_pager_filename_t filename,
-			   boolean_t add)
+S_default_pager_paging_file (mach_port_t default_pager,
+			     mach_port_t master_device_port,
+			     default_pager_filename_t filename,
+			     boolean_t add)
 {
   return allowed (default_pager, O_WRITE)
     ?: default_pager_paging_file (real_defpager, dev_master, filename, add)
@@ -80,11 +81,11 @@ default_pager_paging_file (mach_port_t default_pager,
 }
 
 kern_return_t
-default_pager_paging_storage (mach_port_t default_pager,
-			      mach_port_t device,
-			      recnum_t *runs, mach_msg_type_number_t nruns,
-			      default_pager_filename_t name,
-			      boolean_t add)
+S_default_pager_paging_storage (mach_port_t default_pager,
+				mach_port_t device,
+				recnum_t *runs, mach_msg_type_number_t nruns,
+				default_pager_filename_t name,
+				boolean_t add)
 {
   return allowed (default_pager, O_WRITE)
     ?: default_pager_paging_storage (real_defpager, dev_master,
@@ -93,10 +94,10 @@ default_pager_paging_storage (mach_port_t default_pager,
 }
 
 kern_return_t
-default_pager_object_set_size (mach_port_t memory_object,
-			       mach_port_t reply_port,
-			       mach_port_seqno_t seqno,
-			       vm_size_t object_size_limit)
+S_default_pager_object_set_size (mach_port_t memory_object,
+				 mach_port_t reply_port,
+				 mach_port_seqno_t seqno,
+				 vm_size_t object_size_limit)
 {
   /* This is sent to an object, not the control port.  */
   return MIG_BAD_ID;