===================================================================
RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v
retrieving revision 1.14
retrieving revision 1.19
diff -u -p -r1.14 -r1.19
--- OpenXM/src/util/ox_pathfinder.c	2003/12/04 03:17:33	1.14
+++ OpenXM/src/util/ox_pathfinder.c	2004/02/28 13:39:42	1.19
@@ -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.18 2004/02/28 12:27:15 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 */
@@ -1084,6 +1088,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 +1100,27 @@ 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;
 }