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

Diff for /OpenXM/src/kxx/oxlog.c between version 1.6 and 1.7

version 1.6, 2000/02/09 12:02:56 version 1.7, 2000/02/09 12:24:52
Line 1 
Line 1 
 /*$OpenXM: OpenXM/src/kxx/oxlog.c,v 1.5 2000/01/19 03:13:40 takayama Exp $*/  /*$OpenXM: OpenXM/src/kxx/oxlog.c,v 1.6 2000/02/09 12:02:56 takayama Exp $*/
 #include <stdio.h>  #include <stdio.h>
 #include <signal.h>  #include <signal.h>
 #include <string.h>  #include <string.h>
Line 36  main(int argc, char *argv[]) {
Line 36  main(int argc, char *argv[]) {
   if (argc >= 2) {    if (argc >= 2) {
     oxname = argv[1];      oxname = argv[1];
     oxname = toFullPath(oxname);      oxname = toFullPath(oxname);
           if (oxname == NULL) oxname="NULL";
   }    }
   if (argc == 2) {    if (argc == 2) {
     execl(oxname,oxname,NULL);      execl(oxname,oxname,NULL);
Line 93  main(int argc, char *argv[]) {
Line 94  main(int argc, char *argv[]) {
           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);            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 {    }else {
     fprintf(stderr,"Error in oxlog: cannot handle argc=%d\n",argc);      fprintf(stderr,"Error in oxlog: cannot handle argc=%d\n",argc);
     fprintf(stderr,"oxname=%s\n",oxname);          fprintf(stderr,"oxname=%s\n",oxname);
     for (i=0; i<argc; i++) {      for (i=0; i<argc; i++) {
       fprintf(stderr,"argv[%d]=%s ",i,argv[i]);        fprintf(stderr,"argv[%d]=%s ",i,argv[i]);
     }      }
Line 131  mainold1() {
Line 132  mainold1() {
 char *toFullPath(char *s) {  char *toFullPath(char *s) {
   extern int Debug_which;    extern int Debug_which;
   char *path ="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin:/usr/openwin/bin:/usr/X/bin";    char *path ="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin:/usr/openwin/bin:/usr/X/bin";
     char *s2;
   if (strlen(s) == 0) {    if (strlen(s) == 0) {
     return(s);      return(s);
   }    }
   if (strchr(s,'/') != NULL) return(s);    if (strchr(s,'/') != NULL) return(s);
   else {    else {
     s = which(s,getenv("PATH"));      s2 = which(s,getenv("PATH"));
   }    }
   if (s == NULL) {    if (s2 == NULL) {
         if (Debug_which) fprintf(stderr,"Could not find %s in your search path.\n",s);          if (Debug_which) fprintf(stderr,"Could not find arg[1] in your search path.\n");
         if (Debug_which) fprintf(stderr,"You path is %s.\n",getenv("PATH"));          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);          if (Debug_which) fprintf(stderr,"Trying to find in the path: %s\n",path);
         s = which(s,path);          s2 = which(s,path);
   }    }
   return(s);    return(s2);
 }  }
   
 /*which("xterm", getenv("PATH"));*/  /*which("xterm", getenv("PATH"));*/
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>