[BACK]Return to ox_pathfinder.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / util

Diff for /OpenXM/src/util/ox_pathfinder.c between version 1.13 and 1.14

version 1.13, 2003/12/03 13:38:39 version 1.14, 2003/12/04 03:17:33
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.12 2003/12/03 08:58:35 takayama Exp $ */  /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.13 2003/12/03 13:38:39 takayama Exp $ */
 /* Moved from misc-2003/07/cygwin/test.c */  /* Moved from misc-2003/07/cygwin/test.c */
   
 #include <stdio.h>  #include <stdio.h>
Line 14 
Line 14 
 #include <string.h>  #include <string.h>
 #include "ox_pathfinder.h"  #include "ox_pathfinder.h"
   
   int OX_P_stdin = -1;
   int OX_P_stdout = -1;
   int OX_P_stderr = -1;
   
 extern char **environ;  extern char **environ;
   
 static int getOStypei();  static int getOStypei();
Line 115  static void myforkwait() {
Line 119  static void myforkwait() {
   pid = wait(&status);    pid = wait(&status);
   fprintf(stderr,"Child process %d is exiting.\n",pid);    fprintf(stderr,"Child process %d is exiting.\n",pid);
   if (pid < 0) {    if (pid < 0) {
         perror("wait");      perror("wait");
   }    }
   for (i=0; i<Myforkcp; i++) {    for (i=0; i<Myforkcp; i++) {
     if (Myforkchildren[i]  == pid) {      if (Myforkchildren[i]  == pid) {
Line 158  int oxForkExec(char **argv) {
Line 162  int oxForkExec(char **argv) {
     if (NoX) {      if (NoX) {
       FILE *null;        FILE *null;
       null = fopen("/dev/null","wb");        null = fopen("/dev/null","wb");
       dup2(fileno(null),1);        if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
       dup2(fileno(null),2);        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);      execve(argv[0],argv,environ);
     /* This place will never be reached unless execv fails. */      /* This place will never be reached unless execv fails. */
     fprintf(stderr,"oxForkExec fails: ");      fprintf(stderr,"oxForkExec fails: ");
Line 173  int oxForkExecBlocked(char **argv) {
Line 181  int oxForkExecBlocked(char **argv) {
   char **eee;    char **eee;
   int m;    int m;
   int status;    int status;
   m = 0;  
   if (argv == NULL) {    if (argv == NULL) {
     fprintf(stderr,"Cannot fork and exec.\n"); return -1;      fprintf(stderr,"Cannot fork and exec.\n"); return -1;
   }    }
   if ((pid = fork()) > 0) {    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 */  
     }  
     Myforkchildren[Myforkcp++] = pid;      Myforkchildren[Myforkcp++] = pid;
     if (Myforkcp >= MYFORKCP_SIZE-1) {      if (Myforkcp >= MYFORKCP_SIZE-1) {
       fprintf(stderr,"Child process table is full.\n");        fprintf(stderr,"Child process table is full.\n");
       Myforkcp = 0;        Myforkcp = 0;
     }      }
     waitpid(pid,&status,0);  /* block */      if (waitpid(pid,&status,0) < 0) {  /* blocked */
         perror("waitpid");
       }
     return status;      return status;
   }else{    }else{
     /* close the specified files */      /* close the specified files */
Line 201  int oxForkExecBlocked(char **argv) {
Line 205  int oxForkExecBlocked(char **argv) {
     if (NoX) {      if (NoX) {
       FILE *null;        FILE *null;
       null = fopen("/dev/null","wb");        null = fopen("/dev/null","wb");
       dup2(fileno(null),1);        if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
       dup2(fileno(null),2);        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);      execve(argv[0],argv,environ);
     /* This place will never be reached unless execv fails. */      /* This place will never be reached unless execv fails. */
     fprintf(stderr,"oxForkExecBlock fails: ");      fprintf(stderr,"oxForkExecBlock fails: ");
Line 875  char *generateTMPfileName2(char *seed,char *ext,int us
Line 883  char *generateTMPfileName2(char *seed,char *ext,int us
   char *extold;    char *extold;
   if (ext == NULL) ext="";    if (ext == NULL) ext="";
   else {    else {
         extold = ext;      extold = ext;
         ext = (char *) mymalloc(strlen(ext)+3);      ext = (char *) mymalloc(strlen(ext)+3);
         if (ext == NULL) {fprintf(stderr,"No more memory.\n"); return NULL;}      if (ext == NULL) {fprintf(stderr,"No more memory.\n"); return NULL;}
         strcpy(ext,".");      strcpy(ext,".");
         strcat(ext,extold);      strcat(ext,extold);
   }    }
   if (usetmp) {    if (usetmp) {
         tmp = getenv("TMP");      tmp = getenv("TMP");
         if (tmp == NULL) {      if (tmp == NULL) {
           tmp = getenv("TEMP");        tmp = getenv("TEMP");
         }      }
         if ((tmp == NULL) && (strcmp(getOStypes(),"Windows-native") != 0)) {      if ((tmp == NULL) && (strcmp(getOStypes(),"Windows-native") != 0)) {
           tmp = "/tmp";        tmp = "/tmp";
         }      }
         tmp = winPathToCygwinPath(tmp);      tmp = winPathToCygwinPath(tmp);
   }else{    }else{
         tmp = NULL;      tmp = NULL;
   }    }
   if (tmp != NULL) {    if (tmp != NULL) {
     fname = (char *)mymalloc(strlen(tmp)+strlen(seed)+40);      fname = (char *)mymalloc(strlen(tmp)+strlen(seed)+40);
Line 908  char *generateTMPfileName2(char *seed,char *ext,int us
Line 916  char *generateTMPfileName2(char *seed,char *ext,int us
     }      }
     if (getFileSize(fname) < 0) {      if (getFileSize(fname) < 0) {
       prevnum = num;        prevnum = num;
           if (win) fname= cygwinPathToWinPath(fname);        if (win) fname= cygwinPathToWinPath(fname);
       return fname;        return fname;
     } else {      } else {
       if ((num > MAXTMP2-10) && (!clean)) {        if ((num > MAXTMP2-10) && (!clean)) {
Line 974  char *getCommandPath(char *cmdname)
Line 982  char *getCommandPath(char *cmdname)
   /* Use /cygdrive format always. */    /* Use /cygdrive format always. */
   if (cmdname == NULL) return NULL;    if (cmdname == NULL) return NULL;
   if (strlen(cmdname) < 1) {    if (strlen(cmdname) < 1) {
         errorPathFinder("getCommandPath: cmdname is an empty string.\n");      errorPathFinder("getCommandPath: cmdname is an empty string.\n");
         return NULL;      return NULL;
   }    }
   if (cmdname[0] == '/') {    if (cmdname[0] == '/') {
         if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */      if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */
         }else{      }else{
           msg = (char *)mymalloc(strlen(cmdname)+30);        msg = (char *)mymalloc(strlen(cmdname)+30);
           sprintf(msg,"getCommandPath: %s is not found.");        sprintf(msg,"getCommandPath: %s is not found.");
           errorPathFinder(msg);        errorPathFinder(msg);
           return NULL;        return NULL;
         }      }
         return cmdname;      return cmdname;
   }    }
   
   path = getOpenXM_HOME();  /* It will return /cygdrive for windows. */    path = getOpenXM_HOME();  /* It will return /cygdrive for windows. */
   if (path != NULL) {    if (path != NULL) {
         path2 = (char *)mymalloc(strlen(path)+5);      path2 = (char *)mymalloc(strlen(path)+5);
         strcpy(path2,path);      strcpy(path2,path);
         strcat(path2,"bin");      strcat(path2,"bin");
         ss = oxWhich(cmdname,path2);      ss = oxWhich(cmdname,path2);
     if (ss != NULL) return ss;      if (ss != NULL) return ss;
   }    }
   
   path = (char *)getenv("PATH");  /* Todo: it will not give /cygdrive format*/    path = (char *)getenv("PATH");  /* Todo: it will not give /cygdrive format*/
   ss = oxWhich(cmdname,path);    ss = oxWhich(cmdname,path);
   if (ss == NULL) {    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;    return ss;
 }  }
Line 1013  char *oxWhich_unix(char *cmdname,char *path) {
Line 1021  char *oxWhich_unix(char *cmdname,char *path) {
   char *path2;    char *path2;
   int i,j;    int i,j;
   if (path == NULL) {    if (path == NULL) {
         return NULL;      return NULL;
   }    }
   
   path2 = (char *)mymalloc(strlen(path)+strlen(cmdname)+2);    path2 = (char *)mymalloc(strlen(path)+strlen(cmdname)+2);
   for (i=0, j=0; i <= strlen(path); i++) {    for (i=0, j=0; i <= strlen(path); i++) {
         path2[j] = 0;      path2[j] = 0;
         if ((path[i] == ':') || (path[i] == 0)) {      if ((path[i] == ':') || (path[i] == 0)) {
           strcat(path2,"/"); strcat(path2,cmdname);        strcat(path2,"/"); strcat(path2,cmdname);
           if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */        if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */
                 return path2;          return path2;
           }        }
           j = 0; path2[j] = 0;        j = 0; path2[j] = 0;
         }else{      }else{
           path2[j] = path[i]; j++; path2[j] = 0;        path2[j] = path[i]; j++; path2[j] = 0;
         }      }
   }    }
   return NULL;    return NULL;
 }  }
Line 1075  char *oxEvalEnvVar(char *s) {
Line 1083  char *oxEvalEnvVar(char *s) {
   }    }
 }  }
   
   void oxResetRedirect(void) {
     OX_P_stdin = OX_P_stdout = OX_P_stderr = -1;
   }
   
   int oxDeleteFile(char *fname) {
     if (getFileSize(fname) >= 0) {
       return(unlink(fname));
     }else{
       return(-1);
     }
   }
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>