=================================================================== RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v retrieving revision 1.27 retrieving revision 1.37 diff -u -p -r1.27 -r1.37 --- OpenXM/src/util/ox_pathfinder.c 2004/08/12 12:11:41 1.27 +++ OpenXM/src/util/ox_pathfinder.c 2020/10/03 08:24:14 1.37 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.26 2004/03/05 06:26:52 takayama Exp $ */ +/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.36 2015/10/13 10:16:53 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; @@ -32,20 +38,40 @@ static char *get_oxlog_path(); static int getFileSize(char *fn); static void errorPathFinder(char *s); static void msgPathFinder(char *s); +static char *cygname(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) +static char *cygname(char *s) { + char *name; +#if defined(__MSYS__) + return(s); +#else + name = mymalloc(strlen(s)+16); + strcpy(name,"/cygdrive"); + return(strcat(name,s)); +#endif +} +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 @@ -59,7 +85,7 @@ int ox_pathfinderNoX(int f) { return f; } int ox_pathfinderVerbose(int f) { - extern Verbose_get_home; + extern int Verbose_get_home; if (f < 0) return Verbose_get_home; Verbose_get_home = f; return f; @@ -112,6 +138,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 +188,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 +233,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 +249,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() { /* @@ -229,16 +271,26 @@ static int getOStypei() { 1 windows-cygwin 2 windows-cygwin-on-X 3 windows-native + 4 windows-msys + 5 windows-msys-on-x */ int ostype; char *s,*s2,*s3; -#if defined(__CYGWIN__) +#if defined(__CYGWIN__) || defined(__MSYS__) ostype = 1; #else ostype = 0; #endif if (ostype == 0) return ostype; /* Heuristic method */ + s = getenv("MSYSTEM"); + if (s != NULL) { + if (strcmp(s,"MSYS")==0) return(4); + s = (char *)getenv("WINDOWID"); + if (s != NULL) { + return 5; // not tested. + } + } s = (char *)getenv("WINDOWID"); if (s != NULL) { return 2; @@ -262,6 +314,10 @@ char *getOStypes() { return("Windows-cygwin-on-X"); }else if (ostype == 3) { return("Windows-native"); + }else if (ostype == 4) { + return("Windows-msys"); + }else if (ostype == 5) { + return("Windows-msys-on-X"); }else{ return("unix"); } @@ -365,25 +421,25 @@ char *getOpenXM_HOME() { if (getOStypei() != 3) { p = "/usr/local/OpenXM"; }else{ - p = "/cygdrive/c/usr/local/OpenXM"; + p = cygname("/c/usr/local/OpenXM"); } if (getFileSize(p) != -1) return addSlash(p); msg_get_home(1,"OpenXM is not found under /usr/local"); if (getOStypei() != 0) { - p = "/cygdrive/c/OpenXM"; + p = cygname("/c/OpenXM"); if (getFileSize(p) != -1) return addSlash(p); msg_get_home(1,"OpenXM is not found under c:\\"); - p = "/cygdrive/c/OpenXM-win"; + p = cygname("/c/OpenXM-win"); if (getFileSize(p) != -1) return addSlash(p); msg_get_home(1,"OpenXM-win is not found under c:\\"); - p = "/cygdrive/c/Program Files/OpenXM"; + p = cygname("/c/Program Files/OpenXM"); if (getFileSize(p) != -1) return addSlash(p); msg_get_home(1,"OpenXM is not found under c:\\Program Files"); - p = "/cygdrive/c/Program Files/OpenXM-win"; + p = cygname("/c/Program Files/OpenXM-win"); if (getFileSize(p) != -1) return addSlash(p); msg_get_home(1,"OpenXM-win is not found under c:\\Program Files"); @@ -560,9 +616,24 @@ char *cygwinPathToWinPath(char *s) { }else{ strcpy(ans,s); } +#if defined(__MSYS__) + pos = (char *)strstr(s,"/c/"); + if (pos == s) { + strcpy(ans,&(s[1])); + ans[0] = s[1]; ans[1] = ':'; ans[2] = '\\'; + }else{ + strcpy(ans,s); + } +#endif 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); } @@ -656,7 +727,7 @@ char **getServerEnv(char *oxServer) { argv[i] = get_ox_path(); i++; argv[i] = NULL; argv[i] = "-ox"; i++; argv[i] = NULL; argv[i] = oxServer; i++; argv[i] = NULL; - }else{ + }else if ((ostype == 1) || (ostype == 3)) { // cygwin or windows-native if (!NoX) { if (getFileSize("/cygdrive/c/winnt/system32/cmd.exe") >= 0) { oxterm = "/cygdrive/c/winnt/system32/cmd.exe /c start /min "; @@ -669,6 +740,7 @@ char **getServerEnv(char *oxServer) { NoX = 1; } } + printf("oxterm=%s\n",oxterm); fflush(NULL); oxlog = " "; if (!NoX) { argv[i] = "/c"; i++; argv[i] = NULL; @@ -678,8 +750,21 @@ char **getServerEnv(char *oxServer) { argv[i] = cygwinPathToWinPath(get_ox_path()); i++; argv[i] = NULL; argv[i] = "-ox"; i++; argv[i] = NULL; argv[i] = oxServer; i++; argv[i] = NULL; + }else { + /* msys with mintty*/ + if (!NoX) { + oxterm = "/usr/bin/mintty"; + } + if (!NoX) { + argv[i] = oxterm ; i++; argv[i] = NULL; + argv[i] = "--exec"; i++; argv[i] = NULL; + } + argv[i] = get_ox_path(); i++; argv[i] = NULL; + argv[i] = "-ox"; i++; argv[i] = NULL; + argv[i] = oxServer; i++; argv[i] = NULL; } + aaa = (char **) mymalloc(sizeof(char*)*(i+1)); if (aaa == NULL) nomemory(0); msg_get_home(2,"--------- Result --------------"); @@ -1011,7 +1096,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; } @@ -1123,6 +1208,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; @@ -1137,7 +1223,12 @@ 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; @@ -1195,3 +1286,7 @@ int oxpSendStringAsFile(char *user,char *hostname, cha char *oxpReadOneTimePasswordFromFile(char *filename) { } + +int ox_pathfinderEngineLogToStdout(int state) { + EngineLogToStdout = state; +}