===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxlog.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM/src/kxx/oxlog.c	1999/11/01 02:18:15	1.2
+++ OpenXM/src/kxx/oxlog.c	2000/02/09 12:02:56	1.6
@@ -1,5 +1,8 @@
+/*$OpenXM: OpenXM/src/kxx/oxlog.c,v 1.5 2000/01/19 03:13:40 takayama Exp $*/
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -18,55 +21,79 @@
          -ox /home/nobuki/kxx/ox_asir  >& /dev/null
           2     3
 */
+static int Debug_which = 1;
+char *toFullPath(char *s);
+char *which(char *s,char *env);
 main(int argc, char *argv[]) {
   sigset_t sss;
   int i;
+  char *oxname ="???";
   /* char *env[2];
   env[0] = NULL;*/
   sigemptyset(&sss);
   sigaddset(&sss,SIGINT);
   sigprocmask(SIG_BLOCK,&sss,NULL);
-
-  if (argc == 4) {
-    execl(argv[1],argv[1],argv[2],argv[3],NULL);
+  if (argc >= 2) {
+    oxname = argv[1];
+    oxname = toFullPath(oxname);
+  }
+  if (argc == 2) {
+    execl(oxname,oxname,NULL);
+  }else if (argc == 3) {
+    execl(oxname,oxname,argv[2],NULL);
+  }else if (argc == 4) {
+    execl(oxname,oxname,argv[2],argv[3],NULL);
   }else if (argc == 5) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],NULL);
+    execl(oxname,oxname,argv[2],argv[3],argv[4],NULL);
   }else if (argc == 6) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],NULL);
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],NULL);
   }else if (argc == 7) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],NULL);
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],NULL);
   }else if (argc == 8) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],NULL);
   }else if (argc == 9) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],NULL);
   }else if (argc == 10) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],NULL);
   }else if (argc == 11) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],NULL);
   }else if (argc == 12) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],argv[11],NULL);
   }else if (argc == 13) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],NULL);
   }else if (argc == 14) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],NULL);
   }else if (argc == 15) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],NULL);
   }else if (argc == 16) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],argv[15],NULL);
   }else if (argc == 17) {
-    execl(argv[1],argv[1],argv[2],argv[3],argv[4],argv[5],argv[6],
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
 	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],argv[15],argv[16],NULL);
+  }else if (argc == 18) {
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
+	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],argv[15],argv[16],argv[17],NULL);
+  }else if (argc == 19) {
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
+	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],argv[15],argv[16],argv[17],argv[18],NULL);
+  }else if (argc == 20) {
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
+	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],argv[15],argv[16],argv[17],argv[18],argv[19],NULL);
+  }else if (argc == 21) {
+    execl(oxname,oxname,argv[2],argv[3],argv[4],argv[5],argv[6],
+	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],argv[15],argv[16],argv[17],argv[18],argv[19],argv[20],NULL);
   }else {
     fprintf(stderr,"Error in oxlog: cannot handle argc=%d\n",argc);
+    fprintf(stderr,"oxname=%s\n",oxname);
     for (i=0; i<argc; i++) {
       fprintf(stderr,"argv[%d]=%s ",i,argv[i]);
     }
@@ -76,6 +103,7 @@ main(int argc, char *argv[]) {
     exit(10);
   }
   fprintf(stderr,"\nError in oxlog: Failed to start the process.\n");
+  fprintf(stderr,"oxname=%s\n",oxname);
   for (i=0; i<argc; i++) {
     fprintf(stderr,"argv[%d]=%s ",i,argv[i]);
   }
@@ -98,5 +126,48 @@ mainold1() {
   execl("/usr/X11R6/bin/xterm","/usr/X11R6/bin/xterm",
 	"-e","/home/nobuki/kxx/ox","-ox","/home/nobuki/kxx/ox_asir",NULL);
 /*  execl("/home/nobuki/kxx/ox","/home/nobuki/kxx/ox","-ox","/home/nobuki/kxx/ox_asir",NULL);*/
+}
+
+char *toFullPath(char *s) {
+  extern int Debug_which;
+  char *path ="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin:/usr/openwin/bin:/usr/X/bin";
+  if (strlen(s) == 0) {
+    return(s);
+  }
+  if (strchr(s,'/') != NULL) return(s);
+  else {
+    s = which(s,getenv("PATH"));
+  }
+  if (s == NULL) {
+	if (Debug_which) fprintf(stderr,"Could not find %s in your search path.\n",s);
+	if (Debug_which) fprintf(stderr,"You path is %s.\n",getenv("PATH"));
+	if (Debug_which) fprintf(stderr,"Trying to find in the path: %s\n",path);
+	s = which(s,path);
+  }
+  return(s);
+}
+
+/*which("xterm", getenv("PATH"));*/
+char *which(char *prog, char *path_env)
+{
+  extern int Debug_which ;
+  char *tok;
+  char *path;
+  char delim[] = ":";
+  char *e = alloca(strlen(path_env)+1);
+  strcpy(e, path_env);
+  tok = strtok(e, delim);
+  if (Debug_which) fprintf(stderr,"PATH=%s\n",path_env);
+  while (tok != NULL) {
+    char *path = malloc(strlen(tok)+strlen(prog)+2);
+    sprintf(path, "%s/%s", tok, prog);
+    if (access(path, X_OK&R_OK) == 0) {
+	  if (Debug_which) fprintf(stderr,"Found: %s\n",path);
+      return path;
+    }
+    free(path);
+    tok = strtok(NULL, delim);
+  }
+  return NULL;
 }