=================================================================== RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v retrieving revision 1.19 retrieving revision 1.35 diff -u -p -r1.19 -r1.35 --- OpenXM/src/util/ox_pathfinder.c 2004/02/28 13:39:42 1.19 +++ OpenXM/src/util/ox_pathfinder.c 2015/09/26 12:40:51 1.35 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.18 2004/02/28 12:27:15 takayama Exp $ */ +/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.34 2015/09/25 01:47:09 takayama Exp $ */ /* Moved from misc-2003/07/cygwin/test.c */ #include @@ -7,13 +7,19 @@ #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; @@ -37,15 +43,25 @@ 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 @@ -112,6 +128,7 @@ 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; @@ -161,7 +178,7 @@ int oxForkExec(char **argv) { sigaddset(&sss,SIGINT); sigprocmask(SIG_BLOCK,&sss,NULL); } - if (NoX) { + if (NoX && (!EngineLogToStdout)) { FILE *null; null = fopen("/dev/null","wb"); if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1); @@ -206,7 +223,7 @@ int oxForkExecBlocked(char **argv) { sigaddset(&sss,SIGINT); sigprocmask(SIG_BLOCK,&sss,NULL); } - if (NoX) { + if (NoX && (!EngineLogToStdout)) { FILE *null; null = fopen("/dev/null","wb"); if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1); @@ -222,6 +239,21 @@ int oxForkExecBlocked(char **argv) { 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() { /* @@ -562,7 +594,13 @@ char *cygwinPathToWinPath(char *s) { } if (ans[0] == '/') { +#if defined(__MSYS__) && defined(__x86_64__) + strcpy(ans,"C:\\msys64"); +#elif defined(__CYGWIN64__) || (defined(__CYGWIN__) && defined(__x86_64__)) + strcpy(ans,"C:\\cygwin64"); +#else strcpy(ans,"C:\\cygwin"); +#endif strcat(ans,s); } @@ -577,7 +615,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; @@ -620,19 +660,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; @@ -641,10 +697,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."); @@ -993,7 +1049,7 @@ char *getCommandPath(char *cmdname) if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */ }else{ msg = (char *)mymalloc(strlen(cmdname)+30); - sprintf(msg,"getCommandPath: %s is not found."); + sprintf(msg,"getCommandPath: %s is not found.",cmdname); errorPathFinder(msg); return NULL; } @@ -1105,6 +1161,7 @@ int oxDeleteFile(char *fname) { /* 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; @@ -1119,8 +1176,70 @@ int oxKillAll(void) { Myforkcp = 0; return(0); } - +#else +int oxKillAll(void) { + fprintf(stderr,"ERROR: oxKillAll is not implented in mingw\n"); + return(-1); +} +#endif 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; +} + +int oxpSendStringAsFile(char *user,char *hostname, char *filename, char *str) +{ + FILE *fp; + int i; + char *comm; + char *argv[10]; + mode_t oumask; + oumask = umask((mode_t) (64-1)); + /* 077=111 111 */ + fp = fopen(filename,"w"); + umask(oumask); + if (fp == NULL) { + return -1; + } + for (i=0; i