===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxlog.c,v
retrieving revision 1.1.1.1
retrieving revision 1.11
diff -u -p -r1.1.1.1 -r1.11
--- OpenXM/src/kxx/oxlog.c	1999/10/08 02:12:13	1.1.1.1
+++ OpenXM/src/kxx/oxlog.c	2019/09/17 05:33:09	1.11
@@ -1,5 +1,8 @@
+/*$OpenXM: OpenXM/src/kxx/oxlog.c,v 1.10 2003/11/20 07:18:41 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,79 +21,111 @@
          -ox /home/nobuki/kxx/ox_asir  >& /dev/null
           2     3
 */
-main(int argc, char *argv[]) {
-  sigset_t sss;
-  int i;
-  /* char *env[2];
-  env[0] = NULL;*/
-  sigemptyset(&sss);
-  sigaddset(&sss,SIGINT);
-  sigprocmask(SIG_BLOCK,&sss,NULL);
+static int Debug_which = 1;
+extern char **environ;
 
-  if (argc == 4) {
-    execl(argv[1],argv[1],argv[2],argv[3],NULL);
-  }else if (argc == 5) {
-    execl(argv[1],argv[1],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);
-  }else if (argc == 7) {
-    execl(argv[1],argv[1],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],
-	  argv[7],NULL);
-  }else if (argc == 9) {
-    execl(argv[1],argv[1],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],
-	  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],
-	  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],
-	  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],
-	  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],
-	  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],
-	  argv[7],argv[8],argv[9],argv[10],argv[11], argv[12],argv[13],argv[14],NULL);
-  }else {
-    fprintf(stderr,"Error in oxlog: cannot handle argc=%d\n",argc);
-    for (i=0; i<argc; i++) {
-      fprintf(stderr,"argv[%d]=%s ",i,argv[i]);
+/*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;
     }
-    fprintf(stderr,"\n");
-    fprintf(stderr,"Usage example 1: oxlog /usr/X11R6/bin/xterm -icon -e /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir\n");
-    fprintf(stderr,"      example 2: oxlog /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir >& /dev/null\n");
-    exit(10);
+    free(path);
+    tok = strtok(NULL, delim);
   }
-  fprintf(stderr,"\nError in oxlog: Failed to start the process.\n");
-  for (i=0; i<argc; i++) {
-    fprintf(stderr,"argv[%d]=%s ",i,argv[i]);
+  return 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";
+  char *s2;
+  if (strlen(s) == 0 || strchr(s, '/') != NULL) {
+    return s;
   }
-  fprintf(stderr,"\n");
-  exit(20);
+  s2 = which(s, getenv("PATH"));
+  if (s2 == NULL) {
+    if (Debug_which) {
+      fprintf(stderr, "Could not find arg[1] in your search path.\n");
+      fprintf(stderr, "You path is %s.\n", getenv("PATH"));
+      fprintf(stderr, "Trying to find in the path: %s\n", path);
+    }
+    s2 = which(s, path);
+    /* Why? */
+  }
+  return s2;
 }
-mainold1() {
+
+int main(int argc, char *argv[])
+{
   sigset_t sss;
   int i;
+  char *oxname;
   /* char *env[2];
-  env[0] = NULL;*/
+     env[0] = NULL;*/
   sigemptyset(&sss);
-  sigaddset(&sss,SIGINT);
-  sigprocmask(SIG_BLOCK,&sss,NULL);
-  /* for (i=0; i<1000; i++) {
-     sleep(1);
-     printf("Hello\n");
+  sigaddset(&sss, SIGINT);
+  sigprocmask(SIG_BLOCK, &sss, NULL);
+  if (argc >= 2) {
+    oxname = toFullPath(argv[1]);
+    if (oxname == NULL) {
+      oxname = "NULL";
+    } /* Why? */
+
+    /*
+	{
+	  int i;
+	  i=0;
+	  while (environ[i] != NULL) {
+		fprintf(stderr,"%s ",environ[i++]);
+	  }
+	  fprintf(stderr,"\n");
+	}
+    */
+   /* dirty workaround of the bug of xterm -iconic on XQuartz */
+    for (i=2; i<argc; i++) {
+      if (getenv("OX_XTERM_GEOMETRY")!=NULL) {
+	if ((strcmp(argv[i],"-icon")==0) || (strcmp(argv[i],"-iconic")==0)) {
+	  argv[i] = "-rv";
+	}
+      }
      }
-     exit(0); */
-  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);*/
-}
 
+    execve(oxname, argv+1,environ);
+
+    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]);
+    }
+    fprintf(stderr, "\n");
+    exit(20);
+  }else {
+    fprintf(stderr, "Error in oxlog: cannot handle argc=%d\n", argc);
+    fprintf(stderr, "oxname=???\n");
+    for (i=0; i<argc; i++) {
+      fprintf(stderr, "argv[%d]=%s ", i, argv[i]);
+    }
+    fprintf(stderr, "\n");
+    fprintf(stderr, "Usage example 1: oxlog /usr/X11R6/bin/xterm -icon -e /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir\n");
+    fprintf(stderr, "      example 2: oxlog /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir >& /dev/null\n");
+    exit(10);
+  }
+}