[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.8 and 1.9

version 1.8, 2003/11/16 07:14:11 version 1.9, 2003/11/24 11:47:35
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.7 2003/09/08 02:43:47 takayama Exp $ */  /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.8 2003/11/16 07:14:11 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 893  char *getCppPath(void) {
Line 893  char *getCppPath(void) {
 char *getCommandPath(char *cmdname)  char *getCommandPath(char *cmdname)
 {  {
   char *path;    char *path;
   int ostype;  
   char *msg;    char *msg;
   char *path2;    char *path2;
     char *ss;
   int i,j;    int i,j;
   ostype = getOStypei(); /* Todo: getCommandPath_win */    /* 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");
Line 914  char *getCommandPath(char *cmdname)
Line 914  char *getCommandPath(char *cmdname)
         return cmdname;          return cmdname;
   }    }
   
   path = getOpenXM_HOME();    path = getOpenXM_HOME();  /* It will return /cygdrive for windows. */
   if (path != NULL) {    if (path != NULL) {
         path2 = (char *)mymalloc(strlen(path)+strlen(cmdname)+5);          path2 = (char *)mymalloc(strlen(path)+5);
         strcpy(path2,path);          strcpy(path2,path);
         strcat(path2,"bin/");          strcat(path2,"bin");
         strcat(path2,cmdname);          ss = oxWhich(cmdname,path2);
         if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */      if (ss != NULL) return ss;
           return path2;  
         }  
   }    }
   
   path = (char *)getenv("PATH");    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");
     }
     return ss;
   }
   
   char *oxWhich(char *cmdname,char *path) {
     return(oxWhich_unix(cmdname,path));
   }
   
   char *oxWhich_unix(char *cmdname,char *path) {
     char *path2;
     int i,j;
   if (path == NULL) {    if (path == NULL) {
         return NULL;          return NULL;
   }    }
   
   path2 = (char *)mymalloc(strlen(path)+strlen(cmdname)+1);    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] == ':') {          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;
           }            }
Line 944  char *getCommandPath(char *cmdname)
Line 955  char *getCommandPath(char *cmdname)
           path2[j] = path[i]; j++; path2[j] = 0;            path2[j] = path[i]; j++; path2[j] = 0;
         }          }
   }    }
   errorPathFinder("getCommandPath: could not find it in the PATH\n");  
   return NULL;    return NULL;
 }  }
   
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>