===================================================================
RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v
retrieving revision 1.21
retrieving revision 1.35
diff -u -p -r1.21 -r1.35
--- OpenXM/src/util/ox_pathfinder.c	2004/03/03 02:31:51	1.21
+++ 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.20 2004/03/02 06:23:34 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 <stdio.h>
@@ -7,13 +7,19 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
+#if  (!defined(__MINGW32__) &&  !defined(__MINGW64__))
 #include <sys/wait.h>
+#else
+#include <_mingw.h>
+#endif
 #include <signal.h>
 #include <ctype.h>
 #include <time.h>
 #include <string.h>
 #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);
   }
 
@@ -635,7 +673,22 @@ char **getServerEnv(char *oxServer) {
     argv[i] = oxlog; i++; argv[i] = NULL;
     if (!NoX) {
       argv[i] = oxterm ; i++; argv[i] = NULL;
-      argv[i] = oxtermOpt; 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;
@@ -996,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;
     }
@@ -1108,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;
@@ -1122,7 +1176,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;
@@ -1145,3 +1204,42 @@ char *oxTermWhich_unix(int *typep) {
 
   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 <strlen(str); i++) {
+	fputc(str[i],fp);
+  }
+  fclose(fp);
+  if (strcmp(hostname,"localhost") == 0) return 0;
+  comm = (char *)malloc(strlen(user)+strlen(hostname)+strlen(filename)*2+1024);
+  if (comm == NULL) return -2;
+
+  argv[0] = getCommandPath("scp");
+  if (argv[0] == NULL) return -3;
+  argv[1] = filename;
+  comm = (char *)malloc(strlen(user)+strlen(hostname)+strlen(filename)+256);
+  sprintf(comm,"%s@%s:%s",user,hostname,filename);
+  argv[2] = comm;
+  argv[3] = NULL;
+  return oxForkExec(argv);
+}
+
+char *oxpReadOneTimePasswordFromFile(char *filename) {
+}
+
+int ox_pathfinderEngineLogToStdout(int state) {
+  EngineLogToStdout = state;
+}