Minix fixes

5 files changed, 41 insertions, 5 deletions

diff --git a/workInProgress/xsm/Imakefile b/workInProgress/xsm/Imakefile
index 7a3f737c8..99b8be102 100644
--- a/workInProgress/xsm/Imakefile
+++ b/workInProgress/xsm/Imakefile
@@ -1,4 +1,5 @@
 XCOMM $XConsortium: Imakefile,v 1.7 94/02/22 15:42:37 mor Exp $
+XCOMM $XFree86$
 #if !defined(RshCmd)
 #if SystemV
 #ifdef HPArchitecture
@@ -16,16 +17,29 @@ XCOMM $XConsortium: Imakefile,v 1.7 94/02/22 15:42:37 mor Exp $
         DEPLIBS = XawClientDepLibs
 LOCAL_LIBRARIES = XawClientLibs
 
+#ifdef MinixArchitecture
+           SRCS1 = auth.c list.c misc.c printhex.c remote.c restart.c save.c \
+                   xsm.c xtwatch.c Shell.c
+                   
+           OBJS1 = auth.o list.o misc.o printhex.o remote.o restart.o save.o \
+                   xsm.o xtwatch.o Shell.o
+#else
            SRCS1 = auth.c list.c misc.c printhex.c remote.c restart.c save.c \
                    xsm.c xtwatch.c
                    
            OBJS1 = auth.o list.o misc.o printhex.o remote.o restart.o save.o \
                    xsm.o xtwatch.o
+#endif
 
           PROGS1 = xsm
 
+#ifdef MinixArchitecture
+           SRCS2 = xsmclient.c Shell.c
+           OBJS2 = xsmclient.o Shell.o
+#else
            SRCS2 = xsmclient.c
            OBJS2 = xsmclient.o
+#endif
           PROGS2 = xsmclient
 
             SRCS = $(SRCS1) $(SRCS2)
@@ -38,3 +52,6 @@ SpecialCObjectRule(remote,NullParameter,'-DRSHCMD="$(RSHCMD)"')
 #if !HasPutenv
 SpecialCObjectRule(misc,NullParameter,-DNOPUTENV)
 #endif
+#ifdef MinixArchitecture
+ObjectFromSpecialSource(Shell,../../lib/Xt/Shell,-I../../lib/Xt)
+#endif
diff --git a/workInProgress/xsm/restart.c b/workInProgress/xsm/restart.c
index 162d48fe4..f045d5a36 100644
--- a/workInProgress/xsm/restart.c
+++ b/workInProgress/xsm/restart.c
@@ -1,4 +1,5 @@
-/* $XConsortium: restart.c,v 1.4 94/04/17 21:15:18 mor Exp $ */
+/* $XConsortium: restart.c,v 1.5 94/05/12 11:59:01 mor Exp $ */
+/* $XFree86$ */
 /******************************************************************************
 
 Copyright (c) 1993  X Consortium
@@ -44,6 +45,9 @@ restart_everything()
     char	*program;
     char	**args;
     char	**env;
+#ifdef MINIX
+    char	*no_env= NULL;
+#endif
     char	**pp;
     int		cnt;
     extern char **environ;
@@ -195,7 +199,8 @@ restart_everything()
 		printf("\n");
 	    }
 
-	    if (!strncmp(c->clientHostname, "local/", 6))
+	    if (strncmp(c->clientHostname, "tcp/", 4) != 0 &&
+		strncmp(c->clientHostname, "decnet/", 7) != 0)
 	    {
 		/*
 		 * The client is being restarted on the local machine.
@@ -227,6 +232,10 @@ restart_everything()
 		 * The client is being restarted on a remote machine.
 		 */
 
+#ifdef MINIX
+		if (env == NULL)
+			env= &no_env;
+#endif
 		remote_start (c->clientHostname, program, args, cwd, env,
 		    non_local_display_env, non_local_session_env);
 	    }
diff --git a/workInProgress/xsm/xsm.h b/workInProgress/xsm/xsm.h
index 29c3a7fb4..32e9ddd49 100644
--- a/workInProgress/xsm/xsm.h
+++ b/workInProgress/xsm/xsm.h
@@ -1,4 +1,5 @@
 /* $XConsortium: xsm.h,v 1.5 94/04/17 21:15:20 rws Exp $ */
+/* $XFree86$ */
 /******************************************************************************
 
 Copyright (c) 1993  X Consortium
@@ -48,7 +49,9 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 #include <setjmp.h>
 #include <limits.h>
+#ifndef X_NO_SYS_PARAM
 #include <sys/param.h>
+#endif
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
 #define PATH_MAX MAXPATHLEN
diff --git a/workInProgress/xsm/xsmclient.c b/workInProgress/xsm/xsmclient.c
index c9bbf7e45..dec55b904 100644
--- a/workInProgress/xsm/xsmclient.c
+++ b/workInProgress/xsm/xsmclient.c
@@ -1,4 +1,5 @@
-/* $XConsortium: xsmclient.c,v 1.19 94/04/17 21:15:21 mor Exp $ */
+/* $XConsortium: xsmclient.c,v 1.20 94/05/20 12:25:42 mor Exp $ */
+/* $XFree86$ */
 /******************************************************************************
 
 Copyright (c) 1993  X Consortium
@@ -52,7 +53,9 @@ in this Software without prior written authorization from the X Consortium.
 #include <unistd.h>
 #endif
 #include <limits.h>
+#ifndef X_NO_SYS_PARAM
 #include <sys/param.h>
+#endif
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
 #define PATH_MAX MAXPATHLEN
@@ -459,7 +462,7 @@ static void CreateMainInterface(ad)
 #ifndef X_NOT_POSIX
 	getcwd((char *)NULL, PATH_MAX),
 #else
-	"unknown-cwd"
+	"unknown-cwd",
 #endif
         XtNfromHoriz, cwdLabel,
         XtNfromVert, quitButton,
diff --git a/workInProgress/xsm/xtwatch.c b/workInProgress/xsm/xtwatch.c
index ea28f462e..db80c10e4 100644
--- a/workInProgress/xsm/xtwatch.c
+++ b/workInProgress/xsm/xtwatch.c
@@ -1,4 +1,5 @@
 /* $XConsortium: xtwatch.c,v 1.7 94/04/17 21:15:22 mor Exp $ */
+/* $XFree86$ */
 /******************************************************************************
 
 Copyright (c) 1993  X Consortium
@@ -28,7 +29,6 @@ in this Software without prior written authorization from the X Consortium.
 #include <X11/ICE/ICElib.h>
 #include <X11/Intrinsic.h>
 
-
 Status
 InitWatchProcs (appContext)
 
@@ -79,5 +79,9 @@ XtInputId	*id;
 {
     IceConn	ice_conn = (IceConn) client_data;
 
+#ifdef MINIX
+    if (!MNX_IceMessagesAvailable(ice_conn))
+    	return;
+#endif
     IceProcessMessages (ice_conn, NULL, NULL);
 }