=================================================================== RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v retrieving revision 1.14 retrieving revision 1.18 diff -u -p -r1.14 -r1.18 --- OpenXM/src/util/ox_pathfinder.c 2003/12/04 03:17:33 1.14 +++ OpenXM/src/util/ox_pathfinder.c 2004/02/28 12:27:15 1.18 @@ -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.17 2003/12/04 10:35:24 takayama Exp $ */ /* Moved from misc-2003/07/cygwin/test.c */ #include @@ -141,6 +141,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 +186,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 +195,7 @@ int oxForkExecBlocked(char **argv) { if (waitpid(pid,&status,0) < 0) { /* blocked */ perror("waitpid"); } + Myforkcp--; return status; }else{ /* close the specified files */ @@ -1084,6 +1087,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 +1099,26 @@ 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