===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf.c,v
retrieving revision 1.18
retrieving revision 1.25
diff -u -p -r1.18 -r1.25
--- OpenXM/src/ox_toolkit/oxf.c	2003/09/15 09:31:42	1.18
+++ OpenXM/src/ox_toolkit/oxf.c	2016/07/14 08:16:19	1.25
@@ -1,27 +1,58 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.17 2003/06/02 10:25:57 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.24 2016/06/30 01:14:00 ohara Exp $ */
 
 /*
    This module includes functions for sending/receiveng CMO's.
-   Some commnets are written in Japanese by the EUC-JP coded
-   character set.
 */
 
+#if defined(_MSC_VER)
+#define _CRT_RAND_S
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <sys/file.h>
-#include <sys/param.h>
 #include <time.h>
+#include <limits.h>
 
-#if defined(__sun__)
+#if defined(__sun__) || defined(__FreeBSD__)
 #include <netdb.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#elif defined(__linux__)
+#include <arpa/inet.h>
 #endif
 
+#if defined(__sun__)
+#include <synch.h>
+#else
+#include <inttypes.h>
+#endif
+
+#if defined(_MSC_VER)
+#include <io.h>
+#include <winsock2.h>
+#define X_OK 0x01
+#define R_OK 0x04
+#define MAXHOSTNAMELEN 256
+#define srandom(s)  (srand((s)))
+static int random()
+{
+    int r;
+    rand_s(&r);
+    return r;
+}
+#define READ(fd,buf,n)   (recv((fd),(buf),(n),0))
+#define WRITE(fd,buf,n)  (send((fd),(buf),(n),0))
+#else
+#include <unistd.h>
+#include <sys/file.h>
+#include <sys/param.h>
+#define READ(fd,buf,n)   (read((fd),(buf),(n)))
+#define WRITE(fd,buf,n)  (write((fd),(buf),(n)))
+#endif
+
 #include "mysocket.h"
 #include "ox_toolkit.h"
 
@@ -32,8 +63,25 @@ static int send_int32_nbo(OXFILE *oxfp, int int32);
 static int receive_int32_lbo(OXFILE *oxfp);
 static int receive_int32_nbo(OXFILE *oxfp);
 
+static int send_int64_nbo_le(OXFILE *oxfp, double int64);
+static int send_int64_lbo(OXFILE *oxfp, double int64);
+static double receive_int64_nbo_le(OXFILE *oxfp);
+static double receive_int64_lbo(OXFILE *oxfp);
+
 static void pipe_send_info(int fd, char *hostname, int port, char *password);
 
+/* translating double of little endian byte order to one of big endian. */
+double htonll_le(double n)
+{
+    int i;
+    double r;
+	char *sp = (char *)&n, *dp = (char *)&r + sizeof(double)-1;
+    for(i=0; i<sizeof(double); i++) {
+		*dp-- = *sp++;
+    }
+    return r;
+}
+
 /* enable write buffering */
 int oxf_setbuffer(OXFILE *oxfp, char *buf, int size)
 {
@@ -49,11 +97,54 @@ int oxf_setbuffer(OXFILE *oxfp, char *buf, int size)
     return 0;
 }
 
+void OX_FD_ZERO(OXFILE_set *s)
+{
+    memset(s,0,sizeof(OXFILE_set));
+}
+
+void OX_FD_SET(OXFILE *oxfp,OXFILE_set *s)
+{
+    if (oxfp != NULL && oxfp->fd >=0 && oxfp->fd < OX_FD_SETSIZE && !FD_ISSET(oxfp->fd,&(s->fdset))) {
+        FD_SET(oxfp->fd,&(s->fdset));
+        s->p[oxfp->fd] = oxfp;
+        s->count++; 
+    }
+}
+
+void OX_FD_CLR(OXFILE *oxfp,OXFILE_set *s)
+{
+    if (oxfp != NULL && oxfp->fd >=0 && oxfp->fd < OX_FD_SETSIZE && FD_ISSET(oxfp->fd,&(s->fdset))) {
+        FD_CLR(oxfp->fd,&(s->fdset));
+        s->p[oxfp->fd] = NULL;
+        s->count--; 
+    }
+}
+
+int OX_FD_ISSET(OXFILE *oxfp,OXFILE_set *s)
+{
+    if (oxfp != NULL && oxfp->fd >=0 && oxfp->fd < OX_FD_SETSIZE) {
+        return FD_ISSET(oxfp->fd,&(s->fdset));
+    }
+    return 0;
+}
+
+/* The argument `s' is a set of file descripters for reading */
+OXFILE *oxf_select(OXFILE_set *s, struct timeval *tv)
+{
+    int r;
+    r = select(OX_FD_SETSIZE,&(s->fdset),NULL,NULL,tv);
+    return (r<0)? NULL: s->p[r];
+}
+
 int oxf_read(void *buffer, size_t size, size_t num, OXFILE *oxfp)
 {
-    int n = read(oxfp->fd, buffer, size*num);
+    int n = READ(oxfp->fd, buffer, size*num);
     if (n <= 0) {
+#if 0
         oxfp->error = 1;
+#else
+        exit(0);
+#endif
     }
     return n;
 }
@@ -62,17 +153,46 @@ int oxf_write(void *buffer, size_t size, size_t num, O
 {
     size_t sz = size*num;
     if (oxfp->wbuf == NULL) { /* no buffering */
-        return write(oxfp->fd, buffer, sz);
+        return WRITE(oxfp->fd, buffer, sz);
     }
     if ((oxfp->wbuf_count + sz) >= oxfp->wbuf_size) {
         oxf_flush(oxfp);
-        return write(oxfp->fd, buffer, sz);
+        return WRITE(oxfp->fd, buffer, sz);
     }
     memcpy(oxfp->wbuf + oxfp->wbuf_count, buffer, sz);
     oxfp->wbuf_count += sz;
     return sz;
 }
 
+/* sending an object of int64 type with Network Byte Order. */
+static int send_int64_nbo_le(OXFILE *oxfp, double int64)
+{
+    int64 = htonll_le(int64);
+    return oxf_write(&int64, sizeof(double), 1, oxfp);
+}
+
+/* sending an object of int64 type with Local Byte Order. */
+static int send_int64_lbo(OXFILE *oxfp, double int64)
+{
+    return oxf_write(&int64, sizeof(double), 1, oxfp);
+}
+
+/* receiving an object of int64 type with Network Byte Order. */
+static double receive_int64_nbo_le(OXFILE *oxfp)
+{
+    double tag;
+    oxf_read(&tag, sizeof(double), 1, oxfp);
+    return htonll_le(tag);
+}
+
+/* receiving an object of int64 type with Local Byte Order. */
+static double receive_int64_lbo(OXFILE *oxfp)
+{
+    double tag;
+    oxf_read(&tag, sizeof(double), 1, oxfp);
+    return tag;
+}
+
 /* sending an object of int32 type with Network Byte Order. 
    (not equal to cmo_int32 type)  */
 static int send_int32_nbo(OXFILE *oxfp, int int32)
@@ -125,6 +245,8 @@ OXFILE *oxf_open(int fd)
     oxfp->wbuf = NULL;
     oxfp->wbuf_size = 0;
     oxfp->wbuf_count = 0;
+    oxfp->send_double    = send_int64_lbo;
+    oxfp->receive_double = receive_int64_lbo;
     return oxfp;
     /* oxfp->fp = fdopen(fd, "a+"); */
     /* return (oxfp->fp != NULL)? oxfp: NULL; */
@@ -173,7 +295,7 @@ void oxf_determine_byteorder_server(OXFILE *oxfp)
 void oxf_flush(OXFILE *oxfp)
 {
     if (oxfp->wbuf != NULL) {
-        write(oxfp->fd, oxfp->wbuf, oxfp->wbuf_count);
+        WRITE(oxfp->fd, oxfp->wbuf, oxfp->wbuf_count);
         oxfp->wbuf_count = 0;
     }
 }
@@ -189,12 +311,18 @@ void oxf_close(OXFILE *oxfp)
 
 void oxf_setopt(OXFILE *oxfp, int mode)
 {
-    if (mode == OXF_SETOPT_LBO) {
-        oxfp->send_int32    = send_int32_lbo;
-        oxfp->receive_int32 = receive_int32_lbo;
-    }else if (mode == OXF_SETOPT_NBO) {
-        oxfp->send_int32    = send_int32_nbo;
-        oxfp->receive_int32 = receive_int32_nbo;
+    int m = 1;
+    if (mode == OXF_SETOPT_NBO && *(char *)&m) {
+		/* Little endian architecture. */
+		oxfp->send_int32     = send_int32_nbo;
+		oxfp->receive_int32  = receive_int32_nbo;
+		oxfp->send_double    = send_int64_nbo_le;
+		oxfp->receive_double = receive_int64_nbo_le;
+	}else {
+		oxfp->send_int32     = send_int32_lbo;
+		oxfp->receive_int32  = receive_int32_lbo;
+		oxfp->send_double    = send_int64_lbo;
+		oxfp->receive_double = receive_int64_lbo;
     }
 }
 
@@ -292,6 +420,7 @@ char *which(char *exe, const char *env)
     return NULL;
 }
 
+#if !defined(_MSC_VER)
 /* Remarks: ssh determines remote host by his name, i.e. by arg[0]. */
 int oxc_start(char *remote_host, int port, char *passwd)
 {
@@ -335,6 +464,7 @@ int oxc_start_with_pipe(char *remote_host, int port, c
     }
     return pid;
 }
+#endif
 
 static void pipe_send_string(int fd, char *s)
 {