=================================================================== RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v retrieving revision 1.12 retrieving revision 1.33 diff -u -p -r1.12 -r1.33 --- OpenXM/src/util/ox_pathfinder.c 2003/12/03 08:58:35 1.12 +++ OpenXM/src/util/ox_pathfinder.c 2015/08/06 22:33:21 1.33 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.11 2003/12/03 03:21:16 takayama Exp $ */ +/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.32 2015/08/03 20:56:50 takayama Exp $ */ /* Moved from misc-2003/07/cygwin/test.c */ #include @@ -7,13 +7,23 @@ #include #include #include +#if (!defined(__MINGW32__) && !defined(__MINGW64__)) #include +#else +#include <_mingw.h> +#endif #include #include #include #include #include "ox_pathfinder.h" +void *sGC_malloc(int); + +int OX_P_stdin = -1; +int OX_P_stdout = -1; +int OX_P_stderr = -1; + extern char **environ; static int getOStypei(); @@ -31,16 +41,27 @@ static void msgPathFinder(char *s); static int Verbose_get_home = 0; +static int Verbose = 1; static int NoX = 0; +static int ErrorVerbose = 1; +static int EngineLogToStdout = 0; - -#define nomemory(a) {fprintf(stderr,"(%d) no more memory.\n",a);exit(10);} +#define nomemory(a) {fprintf(stderr,"(%p) no more memory.\n",(void *)a);exit(10);} #define mymalloc(a) sGC_malloc(a) +void pathFinderErrorVerbose(int k) { + static int prev; + if (k >= 0) { + prev = ErrorVerbose; + ErrorVerbose = k; + }else{ + ErrorVerbose = prev; + } +} static void errorPathFinder(char *s) { /* Todo; we need to return the error message to the client if it is used in ox_shell */ - fprintf(stderr,"Error: %s",s); + if (ErrorVerbose) fprintf(stderr,"Error: %s",s); } static void msgPathFinder(char *s) { /* Todo; we need to return the error message to the client if it is used @@ -58,7 +79,7 @@ int ox_pathfinderVerbose(int f) { if (f < 0) return Verbose_get_home; Verbose_get_home = f; return f; -} +} /* cf. ox_pathfinder_quiet() */ /* test main */ /* @@ -107,13 +128,17 @@ void *sGC_malloc(int s) { return (void *) malloc(s); } #define MYFORKCP_SIZE 100 static int Myforkchildren[MYFORKCP_SIZE]; static int Myforkcp=0; +#if (!defined(__MINGW32__) && !defined(__MINGW64__)) static void myforkwait() { int status; int pid; int i,j; - signal(SIGCHLD,SIG_IGN); + /* signal(SIGCHLD,SIG_IGN); It is not allowed in posix */ 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) { + perror("wait"); + } for (i=0; i 0) { + oxResetRedirect(); if (m&2) { /* Do not call singal to turn around a trouble on cygwin. BUG. */ }else{ @@ -152,12 +178,16 @@ int oxForkExec(char **argv) { sigaddset(&sss,SIGINT); sigprocmask(SIG_BLOCK,&sss,NULL); } - if (NoX) { + if (NoX && (!EngineLogToStdout)) { FILE *null; null = fopen("/dev/null","wb"); - dup2(fileno(null),1); - dup2(fileno(null),2); + if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1); + if (OX_P_stderr >= 0) dup2(OX_P_stderr,2); else dup2(fileno(null),2); + }else{ + if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); + if (OX_P_stderr >= 0) dup2(OX_P_stderr,2); } + if (OX_P_stdin >= 0) dup2(OX_P_stdin,0); execve(argv[0],argv,environ); /* This place will never be reached unless execv fails. */ fprintf(stderr,"oxForkExec fails: "); @@ -170,22 +200,20 @@ int oxForkExecBlocked(char **argv) { char **eee; int m; int status; - m = 0; if (argv == NULL) { fprintf(stderr,"Cannot fork and exec.\n"); return -1; } if ((pid = fork()) > 0) { - if (m&2) { - /* Do not call singal to turn around a trouble on cygwin. BUG. */ - }else{ - signal(SIGCHLD,myforkwait); /* to kill Zombie */ - } + oxResetRedirect(); Myforkchildren[Myforkcp++] = pid; if (Myforkcp >= MYFORKCP_SIZE-1) { fprintf(stderr,"Child process table is full.\n"); Myforkcp = 0; } - waitpid(pid,&status,0); /* block */ + if (waitpid(pid,&status,0) < 0) { /* blocked */ + perror("waitpid"); + } + Myforkcp--; return status; }else{ /* close the specified files */ @@ -195,18 +223,37 @@ int oxForkExecBlocked(char **argv) { sigaddset(&sss,SIGINT); sigprocmask(SIG_BLOCK,&sss,NULL); } - if (NoX) { + if (NoX && (!EngineLogToStdout)) { FILE *null; null = fopen("/dev/null","wb"); - dup2(fileno(null),1); - dup2(fileno(null),2); + if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1); + if (OX_P_stderr >= 0) dup2(OX_P_stderr,2); else dup2(fileno(null),2); + }else{ + if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); + if (OX_P_stderr >= 0) dup2(OX_P_stderr,2); } + if (OX_P_stdin >= 0) dup2(OX_P_stdin,0); execve(argv[0],argv,environ); /* This place will never be reached unless execv fails. */ fprintf(stderr,"oxForkExecBlock fails: "); exit(3); } } +#else +static void myforkwait() { + fprintf(stderr,"ERROR: myforkwait is not implented in mingw\n"); + return; +} +int oxForkExec(char **argv) { + /* cf. Kan/shell.c */ + fprintf(stderr,"ERROR: oxForkExec is not implented in mingw\n"); + return(-1); +} +int oxForkExecBlocked(char **argv) { + fprintf(stderr,"ERROR: oxForkExecBlocked is not implented in mingw\n"); + return(-1); +} +#endif static int getOStypei() { /* @@ -547,7 +594,11 @@ char *cygwinPathToWinPath(char *s) { } if (ans[0] == '/') { +#if defined(__CYGWIN64__) + strcpy(ans,"C:\\cygwin64"); +#else strcpy(ans,"C:\\cygwin"); +#endif strcat(ans,s); } @@ -562,7 +613,9 @@ char **getServerEnv(char *oxServer) { int ostype; char *p; char *oxhome; - char *xterm; + char *oxterm; + int oxtermType=0; + char *oxtermOpt; char *oxlog; char *load_sm1_path; char *load_k0_path; @@ -605,19 +658,35 @@ char **getServerEnv(char *oxServer) { strcpy(oxServer,p); 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(); - 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; if (!NoX) { - argv[i] = "/usr/X11R6/bin/xterm"; i++; argv[i] = NULL; - argv[i] = "-icon"; i++; argv[i] = NULL; + argv[i] = oxterm ; i++; argv[i] = NULL; + if (((char *)getenv("OX_XTERM_GEOMETRY")) != NULL) { + /* ex. OX_XTERM_GEOMETRY=80x20+0+0 */ + argv[i] = "-geometry"; i++; argv[i] = NULL; + argv[i] = (char *) getenv("OX_XTERM_GEOMETRY"); i++; argv[i] = NULL; + }else{ + argv[i] = oxtermOpt; i++; argv[i] = NULL; + } + /* dirty hack for buggy international xterm cf. OpenXM FAQ */ + argv[i] = "-xrm"; i++; argv[i] = NULL; + argv[i] = "XTerm*locale:false"; i++; argv[i] = NULL; + + if (((char *)getenv("OX_XTERM_SCROLL")) != NULL) { + argv[i] = "-sb"; i++; argv[i] = NULL; + argv[i] = "-sl"; i++; argv[i] = NULL; + argv[i] = (char *) getenv("OX_XTERM_SCROLL"); i++; argv[i] = NULL; + } argv[i] = "-e"; i++; argv[i] = NULL; } argv[i] = get_ox_path(); i++; argv[i] = NULL; @@ -626,10 +695,10 @@ char **getServerEnv(char *oxServer) { }else{ if (!NoX) { 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; }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; }else{ msg_get_home(2,"cmd.exe is not found. NoX is automatically set."); @@ -872,23 +941,23 @@ char *generateTMPfileName2(char *seed,char *ext,int us char *extold; if (ext == NULL) ext=""; else { - extold = ext; - ext = (char *) mymalloc(strlen(ext)+3); - if (ext == NULL) {fprintf(stderr,"No more memory.\n"); return NULL;} - strcpy(ext,"."); - strcat(ext,extold); + extold = ext; + ext = (char *) mymalloc(strlen(ext)+3); + if (ext == NULL) {fprintf(stderr,"No more memory.\n"); return NULL;} + strcpy(ext,"."); + strcat(ext,extold); } if (usetmp) { - tmp = getenv("TMP"); - if (tmp == NULL) { - tmp = getenv("TEMP"); - } - if ((tmp == NULL) && (strcmp(getOStypes(),"Windows-native") != 0)) { - tmp = "/tmp"; - } - tmp = winPathToCygwinPath(tmp); + tmp = getenv("TMP"); + if (tmp == NULL) { + tmp = getenv("TEMP"); + } + if ((tmp == NULL) && (strcmp(getOStypes(),"Windows-native") != 0)) { + tmp = "/tmp"; + } + tmp = winPathToCygwinPath(tmp); }else{ - tmp = NULL; + tmp = NULL; } if (tmp != NULL) { fname = (char *)mymalloc(strlen(tmp)+strlen(seed)+40); @@ -905,7 +974,7 @@ char *generateTMPfileName2(char *seed,char *ext,int us } if (getFileSize(fname) < 0) { prevnum = num; - if (win) fname= cygwinPathToWinPath(fname); + if (win) fname= cygwinPathToWinPath(fname); return fname; } else { if ((num > MAXTMP2-10) && (!clean)) { @@ -971,33 +1040,33 @@ char *getCommandPath(char *cmdname) /* Use /cygdrive format always. */ if (cmdname == NULL) return NULL; if (strlen(cmdname) < 1) { - errorPathFinder("getCommandPath: cmdname is an empty string.\n"); - return NULL; + errorPathFinder("getCommandPath: cmdname is an empty string.\n"); + return NULL; } if (cmdname[0] == '/') { - if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */ - }else{ - msg = (char *)mymalloc(strlen(cmdname)+30); - sprintf(msg,"getCommandPath: %s is not found."); - errorPathFinder(msg); - return NULL; - } - return cmdname; + if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */ + }else{ + msg = (char *)mymalloc(strlen(cmdname)+30); + sprintf(msg,"getCommandPath: %s is not found.",cmdname); + errorPathFinder(msg); + return NULL; + } + return cmdname; } path = getOpenXM_HOME(); /* It will return /cygdrive for windows. */ if (path != NULL) { - path2 = (char *)mymalloc(strlen(path)+5); - strcpy(path2,path); - strcat(path2,"bin"); - ss = oxWhich(cmdname,path2); + path2 = (char *)mymalloc(strlen(path)+5); + strcpy(path2,path); + strcat(path2,"bin"); + ss = oxWhich(cmdname,path2); if (ss != NULL) return ss; } 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"); + errorPathFinder("oxWhich_unix: could not find it in the path string.\n"); } return ss; } @@ -1010,21 +1079,21 @@ char *oxWhich_unix(char *cmdname,char *path) { char *path2; int i,j; if (path == NULL) { - return NULL; + return NULL; } path2 = (char *)mymalloc(strlen(path)+strlen(cmdname)+2); for (i=0, j=0; i <= strlen(path); i++) { - path2[j] = 0; - if ((path[i] == ':') || (path[i] == 0)) { - strcat(path2,"/"); strcat(path2,cmdname); - if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */ - return path2; - } - j = 0; path2[j] = 0; - }else{ - path2[j] = path[i]; j++; path2[j] = 0; - } + path2[j] = 0; + if ((path[i] == ':') || (path[i] == 0)) { + strcat(path2,"/"); strcat(path2,cmdname); + if (getFileSize(path2) >= 0) { /* Todo: isExecutableFile() */ + return path2; + } + j = 0; path2[j] = 0; + }else{ + path2[j] = path[i]; j++; path2[j] = 0; + } } return NULL; } @@ -1072,3 +1141,103 @@ char *oxEvalEnvVar(char *s) { } } +void oxResetRedirect(void) { + if (OX_P_stdin >= 0) close(OX_P_stdin); + if (OX_P_stdout >= 0) close(OX_P_stdout); + if (OX_P_stderr >= 0) close(OX_P_stderr); + OX_P_stdin = OX_P_stdout = OX_P_stderr = -1; +} + +int oxDeleteFile(char *fname) { + if (getFileSize(fname) >= 0) { + return(unlink(fname)); + }else{ + return(-1); + } +} + +/* This function just kills processes, so if there is a process which + uses ox protocol, it is not relevant to use this functions. +*/ +#if (!defined(__MINGW32__) && !defined(__MINGW64__)) +int oxKillAll(void) { + int i; + int pid; + int status; + for (i=0; i