===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf_old.c,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -p -r1.5 -r1.10
--- OpenXM/src/ox_toolkit/oxf_old.c	2002/04/24 07:45:14	1.5
+++ OpenXM/src/ox_toolkit/oxf_old.c	2016/06/30 01:14:00	1.10
@@ -1,16 +1,22 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/oxf_old.c,v 1.4 2002/04/10 08:55:45 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/oxf_old.c,v 1.9 2015/08/27 03:03:34 ohara Exp $ */
 
 /* このモジュールは互換性のためのものです。*/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <time.h>
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#include <io.h>
+#define MAXHOSTNAMELEN 256
+#else
+#include <unistd.h>
 #include <sys/file.h>
 #include <sys/param.h>
-#include <time.h>
+#endif
 
 #if defined(__sun__)
 #include <netdb.h>
@@ -89,7 +95,7 @@ static char *concat_openxm_home_bin(char *s)
         return s;
     }
 
-    path = malloc(strlen(OpenXM_HOME)+6+strlen(s));
+    path = MALLOC(strlen(OpenXM_HOME)+6+strlen(s));
     sprintf(path, "%s/bin/%s", OpenXM_HOME, s);
     return path;
 }
@@ -106,6 +112,7 @@ void set_OpenXM_HOME()
     }
 }
 
+#if !defined(_MSC_VER)
 void ox_exec_local(char* ctl_prog, char* dat_prog, int portControl, int portStream, char *passwd)
 {
     char  ctl[128], dat[128];
@@ -143,7 +150,7 @@ OXFILE *ox_start(char* host, char* ctl_prog, char* dat
     OXFILE *st, *ct;
     char *passwd = generate_otp();
     int   listen[2];
-    int   ports[2] = {0};  /* short! */
+    int   ports[2] = {0};
 
 	/* host を無視 */
     listen[0] = oxf_listen(&ports[0]);
@@ -186,16 +193,25 @@ OXFILE *ox_start_insecure(char* host, short portContro
 /* ssh -f host oxlog xterm -e ox -ox ox_asir ... */
 void ssh_ox_server(char *remote_host, char *ctl_prog, char *dat_prog, short portControl, short portStream)
 {
+    char buf[2][10];
+/*
     ctl_prog = concat_openxm_home_bin(ctl_prog);
     dat_prog = concat_openxm_home_bin(dat_prog);
+*/
 
     if (fork() == 0) {
+
+        sprintf(buf[0], "%hd", portStream);
+        sprintf(buf[1], "%hd", portControl);
+
         execlp("ssh", "ssh", "-f", remote_host, "oxlog", "xterm", "-icon",
               "-e", ctl_prog, "-insecure", "-ox", dat_prog,
-              "-data", portStream, "-control", portControl,
+              "-data", buf[0], "-control", buf[1],
               "-host", remote_host, NULL);
         exit(1);
     }
+
+    sleep(1); /* wait ssh */
 }
 
 OXFILE *ox_start_remote_with_ssh(char *dat_prog, char* remote_host)
@@ -203,3 +219,4 @@ OXFILE *ox_start_remote_with_ssh(char *dat_prog, char*
     ssh_ox_server(remote_host, "ox", dat_prog, 1200, 1300);
     return ox_start_insecure(remote_host, 1200, 1300);
 }
+#endif