===================================================================
RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v
retrieving revision 1.14
retrieving revision 1.25
diff -u -p -r1.14 -r1.25
--- OpenXM/src/util/ox_pathfinder.c	2003/12/04 03:17:33	1.14
+++ OpenXM/src/util/ox_pathfinder.c	2004/03/04 12:22:47	1.25
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.13 2003/12/03 13:38:39 takayama Exp $ */
+/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.24 2004/03/04 05:13:39 takayama Exp $ */
 /* Moved from misc-2003/07/cygwin/test.c */
 
 #include <stdio.h>
@@ -35,6 +35,7 @@ static void msgPathFinder(char *s);
 
 
 static int Verbose_get_home = 0;
+static int Verbose = 1;
 static int NoX = 0;
 
 
@@ -62,7 +63,7 @@ int ox_pathfinderVerbose(int f) {
   if (f < 0) return Verbose_get_home;
   Verbose_get_home = f;
   return f;
-}
+} /* cf. ox_pathfinder_quiet() */
 
 /* test main   */
 /*
@@ -117,7 +118,7 @@ static void myforkwait() {
   int i,j;
   /* signal(SIGCHLD,SIG_IGN);  It is not allowed in posix */
   pid = wait(&status);
-  fprintf(stderr,"Child process %d is exiting.\n",pid);
+  if (Verbose) fprintf(stderr,"Child process %d is exiting.\n",pid);
   if (pid < 0) {
     perror("wait");
   }
@@ -141,6 +142,7 @@ int oxForkExec(char **argv) {
     fprintf(stderr,"Cannot fork and exec.\n"); return -1;
   }
   if ((pid = fork()) > 0) {
+    oxResetRedirect();
     if (m&2) {
       /* Do not call singal to turn around a trouble on cygwin. BUG. */
     }else{
@@ -185,6 +187,7 @@ int oxForkExecBlocked(char **argv) {
     fprintf(stderr,"Cannot fork and exec.\n"); return -1;
   }
   if ((pid = fork()) > 0) {
+    oxResetRedirect();
     Myforkchildren[Myforkcp++] = pid;
     if (Myforkcp >= MYFORKCP_SIZE-1) {
       fprintf(stderr,"Child process table is full.\n");
@@ -193,6 +196,7 @@ int oxForkExecBlocked(char **argv) {
     if (waitpid(pid,&status,0) < 0) {  /* blocked */
       perror("waitpid");
     }
+    Myforkcp--;
     return status;
   }else{
     /* close the specified files */
@@ -573,7 +577,9 @@ char **getServerEnv(char *oxServer) {
   int ostype;
   char *p;
   char *oxhome;
-  char *xterm;
+  char *oxterm;
+  int  oxtermType=0;
+  char *oxtermOpt;
   char *oxlog;
   char *load_sm1_path;
   char *load_k0_path;
@@ -616,19 +622,31 @@ char **getServerEnv(char *oxServer) {
   strcpy(oxServer,p);
 
   if ((ostype == 0) || (ostype == 2)) {
-    if (!NoX) {
-      xterm = "/usr/X11R6/bin/xterm";
-      if (getFileSize(xterm) == -1) {
-        msg_get_home(2,"xterm is not found. NoX is automatically set.");
-        NoX = 1;
-      }
-    }
     oxlog = get_oxlog_path();
-    xterm = "/usr/X11R6/bin/xterm -icon -e ";
+	if (!NoX) {
+	  oxterm = oxTermWhich_unix(&oxtermType);
+	  if (oxterm == NULL) {
+        msg_get_home(2,"oxterm, rxvt, xterm is not found. NoX is automatically set.");
+        NoX = 1;
+	  }
+	  if (oxtermType == T_XTERM) oxtermOpt = "-icon";
+	  else  oxtermOpt = "-iconic";
+	}
     argv[i] = oxlog; i++; argv[i] = NULL;
     if (!NoX) {
-      argv[i] = "/usr/X11R6/bin/xterm"; i++; argv[i] = NULL;
-      argv[i] = "-icon"; i++; argv[i] = NULL;
+      argv[i] = oxterm ; i++; argv[i] = NULL;
+      if (((char *)getenv("OX_XTERM_GEOMETRY")) != NULL) {
+        /* ex. OX_XTERM_GEOMETRY=80x20+0+0 */
+    	argv[i] = "-geometry"; i++; argv[i] = NULL;
+		argv[i] = (char *) getenv("OX_XTERM_GEOMETRY"); i++; argv[i] = NULL;
+      }else{
+        argv[i] = oxtermOpt; i++; argv[i] = NULL;
+      }
+	  if (((char *)getenv("OX_XTERM_SCROLL")) != NULL) {
+		argv[i] = "-sb"; i++; argv[i] = NULL;
+		argv[i] = "-sl"; i++; argv[i] = NULL;
+		argv[i] = (char *) getenv("OX_XTERM_SCROLL"); i++; argv[i] = NULL;
+	  }
       argv[i] = "-e"; i++; argv[i] = NULL;
     }
     argv[i] = get_ox_path(); i++; argv[i] = NULL;
@@ -637,10 +655,10 @@ char **getServerEnv(char *oxServer) {
   }else{
     if (!NoX) {
       if (getFileSize("/cygdrive/c/winnt/system32/cmd.exe") >= 0) {
-        xterm = "/cygdrive/c/winnt/system32/cmd.exe /c start /min ";
+        oxterm = "/cygdrive/c/winnt/system32/cmd.exe /c start /min ";
         argv[i] = "/cygdrive/c/winnt/system32/cmd.exe"; i++; argv[i] = NULL;
       }else if (getFileSize("/cygdrive/c/windows/system32/cmd.exe") >= 0) {
-        xterm = "/cygdrive/c/windows/system32/cmd.exe  /c start /min ";
+        oxterm = "/cygdrive/c/windows/system32/cmd.exe  /c start /min ";
         argv[i] = "/cygdrive/c/windows/system32/cmd.exe"; i++; argv[i] = NULL;
       }else{
         msg_get_home(2,"cmd.exe is not found. NoX is automatically set.");
@@ -1084,6 +1102,9 @@ char *oxEvalEnvVar(char *s) {
 }
 
 void oxResetRedirect(void) {
+  if (OX_P_stdin >= 0) close(OX_P_stdin);
+  if (OX_P_stdout >= 0) close(OX_P_stdout);
+  if (OX_P_stderr >= 0) close(OX_P_stderr);
   OX_P_stdin = OX_P_stdout = OX_P_stderr = -1;
 }
 
@@ -1093,4 +1114,45 @@ int oxDeleteFile(char *fname) {
   }else{
     return(-1);
   }
+}
+
+/* This function just kills processes, so if there is a process which
+   uses ox protocol, it is not relevant to use this functions.
+*/
+int oxKillAll(void) {
+  int i;
+  int pid;
+  int status;
+  for (i=0; i<Myforkcp; i++) {
+    pid = Myforkchildren[i];
+	if (Verbose) fprintf(stderr,"Sending signal to %d ... ",pid);
+    kill(pid,SIGKILL);
+	waitpid(pid,&status,0);
+	if (Verbose) fprintf(stderr,"Gone.\n");
+  }
+  Myforkcp = 0;
+  return(0);
+}
+
+void ox_pathfinder_quiet(void) {
+  Verbose_get_home = 0;
+  Verbose = 0;
+}
+
+char *oxTermWhich_unix(int *typep) {
+  char *s;
+  char *p;
+  p = (char *) getenv("PATH");
+  s = oxWhich("oxterm",p); *typep = T_OXTERM;
+  if (s != NULL) return s;
+
+/*  skip the search of rxvt  (temporary)
+  s = oxWhich("rxvt",p); *typep = T_RXVT;
+  if (s != NULL) return s;
+*/
+
+  s = oxWhich("xterm",p); *typep = T_XTERM;
+  if (s != NULL) return s;
+
+  return NULL;
 }