===================================================================
RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v
retrieving revision 1.10
retrieving revision 1.17
diff -u -p -r1.10 -r1.17
--- OpenXM/src/util/ox_pathfinder.c	2003/12/01 03:15:37	1.10
+++ OpenXM/src/util/ox_pathfinder.c	2003/12/04 10:35:24	1.17
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.9 2003/11/24 11:47:35 takayama Exp $ */
+/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.16 2003/12/04 06:29:21 takayama Exp $ */
 /* Moved from misc-2003/07/cygwin/test.c */
 
 #include <stdio.h>
@@ -14,6 +14,10 @@
 #include <string.h>
 #include "ox_pathfinder.h"
 
+int OX_P_stdin = -1;
+int OX_P_stdout = -1;
+int OX_P_stderr = -1;
+
 extern char **environ;
 
 static int getOStypei();
@@ -111,9 +115,12 @@ static void myforkwait() {
   int status;
   int pid;
   int i,j;
-  signal(SIGCHLD,SIG_IGN);
+  /* signal(SIGCHLD,SIG_IGN);  It is not allowed in posix */
   pid = wait(&status);
   fprintf(stderr,"Child process %d is exiting.\n",pid);
+  if (pid < 0) {
+    perror("wait");
+  }
   for (i=0; i<Myforkcp; i++) {
     if (Myforkchildren[i]  == pid) {
       for (j=i; j<Myforkcp-1; j++) {
@@ -134,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{
@@ -155,9 +163,13 @@ int oxForkExec(char **argv) {
     if (NoX) {
       FILE *null;
       null = fopen("/dev/null","wb");
-      dup2(fileno(null),1);
-      dup2(fileno(null),2);
+      if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
+      if (OX_P_stderr >= 0) dup2(OX_P_stderr,2); else dup2(fileno(null),2);
+    }else{
+      if (OX_P_stdout >= 0) dup2(OX_P_stdout,1);
+      if (OX_P_stderr >= 0) dup2(OX_P_stderr,2);
     }
+    if (OX_P_stdin >= 0) dup2(OX_P_stdin,0);
     execve(argv[0],argv,environ);
     /* This place will never be reached unless execv fails. */
     fprintf(stderr,"oxForkExec fails: ");
@@ -170,22 +182,20 @@ int oxForkExecBlocked(char **argv) {
   char **eee;
   int m;
   int status;
-  m = 0;
   if (argv == NULL) {
     fprintf(stderr,"Cannot fork and exec.\n"); return -1;
   }
   if ((pid = fork()) > 0) {
-    if (m&2) {
-      /* Do not call singal to turn around a trouble on cygwin. BUG. */
-    }else{
-      signal(SIGCHLD,myforkwait); /* to kill Zombie */
-    }
+    oxResetRedirect();
     Myforkchildren[Myforkcp++] = pid;
     if (Myforkcp >= MYFORKCP_SIZE-1) {
       fprintf(stderr,"Child process table is full.\n");
       Myforkcp = 0;
     }
-    waitpid(pid,&status,0);  /* block */
+    if (waitpid(pid,&status,0) < 0) {  /* blocked */
+      perror("waitpid");
+    }
+    Myforkcp--;
     return status;
   }else{
     /* close the specified files */
@@ -198,9 +208,13 @@ int oxForkExecBlocked(char **argv) {
     if (NoX) {
       FILE *null;
       null = fopen("/dev/null","wb");
-      dup2(fileno(null),1);
-      dup2(fileno(null),2);
+      if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
+      if (OX_P_stderr >= 0) dup2(OX_P_stderr,2); else dup2(fileno(null),2);
+    }else{
+      if (OX_P_stdout >= 0) dup2(OX_P_stdout,1);
+      if (OX_P_stderr >= 0) dup2(OX_P_stderr,2);
     }
+    if (OX_P_stdin >= 0) dup2(OX_P_stdin,0);
     execve(argv[0],argv,environ);
     /* This place will never be reached unless execv fails. */
     fprintf(stderr,"oxForkExecBlock fails: ");
@@ -860,6 +874,77 @@ char *generateTMPfileName(char *seed) {
   return NULL;
 }
 
+#define MAXTMP2  0xffffff
+char *generateTMPfileName2(char *seed,char *ext,int usetmp,int win){
+  char *tmp;
+  char *fname;
+  char *tt;
+  int num;
+  static int prevnum=0; 
+  int i;
+  int clean = 0;
+  char *extold;
+  if (ext == NULL) ext="";
+  else {
+    extold = ext;
+    ext = (char *) mymalloc(strlen(ext)+3);
+    if (ext == NULL) {fprintf(stderr,"No more memory.\n"); return NULL;}
+    strcpy(ext,".");
+    strcat(ext,extold);
+  }
+  if (usetmp) {
+    tmp = getenv("TMP");
+    if (tmp == NULL) {
+      tmp = getenv("TEMP");
+    }
+    if ((tmp == NULL) && (strcmp(getOStypes(),"Windows-native") != 0)) {
+      tmp = "/tmp";
+    }
+    tmp = winPathToCygwinPath(tmp);
+  }else{
+    tmp = NULL;
+  }
+  if (tmp != NULL) {
+    fname = (char *)mymalloc(strlen(tmp)+strlen(seed)+40);
+    if (fname == NULL) nomemory(fname);
+  }else{
+    fname = (char *)mymalloc(strlen(seed)+40);
+    if (fname == NULL) nomemory(fname);
+  }
+  for (num=prevnum+1; num <MAXTMP2; num++) {
+    if (tmp != NULL) {
+      sprintf(fname,"%s/%s-tmp-%d%s",tmp,seed,num,ext);
+    }else{
+      sprintf(fname,"%s-tmp-%d%s",seed,num,ext);
+    }
+    if (getFileSize(fname) < 0) {
+      prevnum = num;
+      if (win) fname= cygwinPathToWinPath(fname);
+      return fname;
+    } else {
+      if ((num > MAXTMP2-10) && (!clean)) {
+        /* Clean the old garbages. */
+        for (i=0; i<MAXTMP2; i++) {
+          if (tmp != NULL) {
+            sprintf(fname,"%s/%s-tmp-%d%s",tmp,seed,i,ext);
+          }else{
+            sprintf(fname,"%s-tmp-%d%s",seed,i,ext);
+          }
+          {
+            struct stat buf;
+            int m;
+            m = stat(fname,&buf);
+            if ((m >= 0) && (buf.st_mtime+120 < time(NULL))) {
+              unlink(fname);
+            }
+          }
+        }
+        num = 0; clean=1; prevnum=0;
+      }
+    }
+  }
+  return NULL;
+}
 
 char *getCppPath(void) {
   static char *cpp = "/usr/local/bin/cpp"; 
@@ -900,33 +985,33 @@ char *getCommandPath(char *cmdname)
   /* Use /cygdrive format always. */
   if (cmdname == NULL) return NULL;
   if (strlen(cmdname) < 1) {
-	errorPathFinder("getCommandPath: cmdname is an empty string.\n");
-	return NULL;
+    errorPathFinder("getCommandPath: cmdname is an empty string.\n");
+    return NULL;
   }
   if (cmdname[0] == '/') {
-	if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */
-	}else{
-	  msg = (char *)mymalloc(strlen(cmdname)+30);
-	  sprintf(msg,"getCommandPath: %s is not found.");
-	  errorPathFinder(msg);
-	  return NULL;
-	}
-	return cmdname;
+    if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */
+    }else{
+      msg = (char *)mymalloc(strlen(cmdname)+30);
+      sprintf(msg,"getCommandPath: %s is not found.");
+      errorPathFinder(msg);
+      return NULL;
+    }
+    return cmdname;
   }
 
   path = getOpenXM_HOME();  /* It will return /cygdrive for windows. */
   if (path != NULL) {
-	path2 = (char *)mymalloc(strlen(path)+5);
-	strcpy(path2,path);
-	strcat(path2,"bin");
-	ss = oxWhich(cmdname,path2);
+    path2 = (char *)mymalloc(strlen(path)+5);
+    strcpy(path2,path);
+    strcat(path2,"bin");
+    ss = oxWhich(cmdname,path2);
     if (ss != NULL) return ss;
   }
 
   path = (char *)getenv("PATH");  /* Todo: it will not give /cygdrive format*/
   ss = oxWhich(cmdname,path);
   if (ss == NULL) {
-	errorPathFinder("oxWhich_unix: could not find it in the path string.\n");
+    errorPathFinder("oxWhich_unix: could not find it in the path string.\n");
   }
   return ss;
 }
@@ -939,21 +1024,21 @@ char *oxWhich_unix(char *cmdname,char *path) {
   char *path2;
   int i,j;
   if (path == NULL) {
-	return NULL;
+    return NULL;
   }
 
   path2 = (char *)mymalloc(strlen(path)+strlen(cmdname)+2);
   for (i=0, j=0; i <= strlen(path); i++) {
-	path2[j] = 0;
-	if ((path[i] == ':') || (path[i] == 0)) {
-	  strcat(path2,"/"); strcat(path2,cmdname);
-	  if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */
-		return path2;
-	  }
-	  j = 0; path2[j] = 0;
-	}else{
-	  path2[j] = path[i]; j++; path2[j] = 0;
-	}
+    path2[j] = 0;
+    if ((path[i] == ':') || (path[i] == 0)) {
+      strcat(path2,"/"); strcat(path2,cmdname);
+      if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */
+        return path2;
+      }
+      j = 0; path2[j] = 0;
+    }else{
+      path2[j] = path[i]; j++; path2[j] = 0;
+    }
   }
   return NULL;
 }
@@ -1001,3 +1086,35 @@ 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;
+}
+
+int oxDeleteFile(char *fname) {
+  if (getFileSize(fname) >= 0) {
+    return(unlink(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];
+	fprintf(stderr,"Sending signal to %d ... ",pid);
+    kill(pid,SIGKILL);
+	waitpid(pid,&status,0);
+	fprintf(stderr,"Gone.\n");
+  }
+  Myforkcp = 0;
+  return(0);
+}