[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.16 and 1.21

version 1.16, 2003/12/04 06:29:21 version 1.21, 2004/03/03 02:31:51
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.15 2003/12/04 05:27:19 takayama Exp $ */  /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.20 2004/03/02 06:23:34 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 35  static void msgPathFinder(char *s);
Line 35  static void msgPathFinder(char *s);
   
   
 static int Verbose_get_home = 0;  static int Verbose_get_home = 0;
   static int Verbose = 1;
 static int NoX = 0;  static int NoX = 0;
   
   
Line 62  int ox_pathfinderVerbose(int f) {
Line 63  int ox_pathfinderVerbose(int f) {
   if (f < 0) return Verbose_get_home;    if (f < 0) return Verbose_get_home;
   Verbose_get_home = f;    Verbose_get_home = f;
   return f;    return f;
 }  } /* cf. ox_pathfinder_quiet() */
   
 /* test main   */  /* test main   */
 /*  /*
Line 117  static void myforkwait() {
Line 118  static void myforkwait() {
   int i,j;    int i,j;
   /* signal(SIGCHLD,SIG_IGN);  It is not allowed in posix */    /* signal(SIGCHLD,SIG_IGN);  It is not allowed in posix */
   pid = wait(&status);    pid = wait(&status);
   fprintf(stderr,"Child process %d is exiting.\n",pid);    if (Verbose) fprintf(stderr,"Child process %d is exiting.\n",pid);
   if (pid < 0) {    if (pid < 0) {
     perror("wait");      perror("wait");
   }    }
Line 576  char **getServerEnv(char *oxServer) {
Line 577  char **getServerEnv(char *oxServer) {
   int ostype;    int ostype;
   char *p;    char *p;
   char *oxhome;    char *oxhome;
   char *xterm;    char *oxterm;
     int  oxtermType=0;
     char *oxtermOpt;
   char *oxlog;    char *oxlog;
   char *load_sm1_path;    char *load_sm1_path;
   char *load_k0_path;    char *load_k0_path;
Line 619  char **getServerEnv(char *oxServer) {
Line 622  char **getServerEnv(char *oxServer) {
   strcpy(oxServer,p);    strcpy(oxServer,p);
   
   if ((ostype == 0) || (ostype == 2)) {    if ((ostype == 0) || (ostype == 2)) {
     if (!NoX) {  
       xterm = "/usr/X11R6/bin/xterm";  
       if (getFileSize(xterm) == -1) {  
         msg_get_home(2,"xterm is not found. NoX is automatically set.");  
         NoX = 1;  
       }  
     }  
     oxlog = get_oxlog_path();      oxlog = get_oxlog_path();
     xterm = "/usr/X11R6/bin/xterm -icon -e ";          if (!NoX) {
             oxterm = oxTermWhich_unix(&oxtermType);
             if (oxterm == NULL) {
           msg_get_home(2,"oxterm, rxvt, xterm is not found. NoX is automatically set.");
           NoX = 1;
             }
             if (oxtermType == T_XTERM) oxtermOpt = "-icon";
             else  oxtermOpt = "-iconic";
           }
     argv[i] = oxlog; i++; argv[i] = NULL;      argv[i] = oxlog; i++; argv[i] = NULL;
     if (!NoX) {      if (!NoX) {
       argv[i] = "/usr/X11R6/bin/xterm"; i++; argv[i] = NULL;        argv[i] = oxterm ; i++; argv[i] = NULL;
       argv[i] = "-icon"; i++; argv[i] = NULL;        argv[i] = oxtermOpt; i++; argv[i] = NULL;
       argv[i] = "-e"; i++; argv[i] = NULL;        argv[i] = "-e"; i++; argv[i] = NULL;
     }      }
     argv[i] = get_ox_path(); i++; argv[i] = NULL;      argv[i] = get_ox_path(); i++; argv[i] = NULL;
Line 640  char **getServerEnv(char *oxServer) {
Line 644  char **getServerEnv(char *oxServer) {
   }else{    }else{
     if (!NoX) {      if (!NoX) {
       if (getFileSize("/cygdrive/c/winnt/system32/cmd.exe") >= 0) {        if (getFileSize("/cygdrive/c/winnt/system32/cmd.exe") >= 0) {
         xterm = "/cygdrive/c/winnt/system32/cmd.exe /c start /min ";          oxterm = "/cygdrive/c/winnt/system32/cmd.exe /c start /min ";
         argv[i] = "/cygdrive/c/winnt/system32/cmd.exe"; i++; argv[i] = NULL;          argv[i] = "/cygdrive/c/winnt/system32/cmd.exe"; i++; argv[i] = NULL;
       }else if (getFileSize("/cygdrive/c/windows/system32/cmd.exe") >= 0) {        }else if (getFileSize("/cygdrive/c/windows/system32/cmd.exe") >= 0) {
         xterm = "/cygdrive/c/windows/system32/cmd.exe  /c start /min ";          oxterm = "/cygdrive/c/windows/system32/cmd.exe  /c start /min ";
         argv[i] = "/cygdrive/c/windows/system32/cmd.exe"; i++; argv[i] = NULL;          argv[i] = "/cygdrive/c/windows/system32/cmd.exe"; i++; argv[i] = NULL;
       }else{        }else{
         msg_get_home(2,"cmd.exe is not found. NoX is automatically set.");          msg_get_home(2,"cmd.exe is not found. NoX is automatically set.");
Line 1110  int oxKillAll(void) {
Line 1114  int oxKillAll(void) {
   int status;    int status;
   for (i=0; i<Myforkcp; i++) {    for (i=0; i<Myforkcp; i++) {
     pid = Myforkchildren[i];      pid = Myforkchildren[i];
     signal(SIGKILL,myforkwait);          if (Verbose) fprintf(stderr,"Sending signal to %d ... ",pid);
       kill(pid,SIGKILL);
           waitpid(pid,&status,0);
           if (Verbose) fprintf(stderr,"Gone.\n");
   }    }
   Myforkcp = 0;    Myforkcp = 0;
   return(0);    return(0);
   }
   
   void ox_pathfinder_quiet(void) {
     Verbose_get_home = 0;
     Verbose = 0;
   }
   
   char *oxTermWhich_unix(int *typep) {
     char *s;
     char *p;
     p = (char *) getenv("PATH");
     s = oxWhich("oxterm",p); *typep = T_OXTERM;
     if (s != NULL) return s;
   
   /*  skip the search of rxvt  (temporary)
     s = oxWhich("rxvt",p); *typep = T_RXVT;
     if (s != NULL) return s;
   */
   
     s = oxWhich("xterm",p); *typep = T_XTERM;
     if (s != NULL) return s;
   
     return NULL;
 }  }
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.21
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>