=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf.c,v retrieving revision 1.20 retrieving revision 1.25 diff -u -p -r1.20 -r1.25 --- OpenXM/src/ox_toolkit/oxf.c 2005/03/03 06:21:22 1.20 +++ OpenXM/src/ox_toolkit/oxf.c 2016/07/14 08:16:19 1.25 @@ -1,26 +1,27 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.19 2005/03/03 04:40:51 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 #include #include -#include #include -#include -#include #include #include -#if defined(__sun__) +#if defined(__sun__) || defined(__FreeBSD__) #include #include #include +#elif defined(__linux__) +#include #endif #if defined(__sun__) @@ -29,6 +30,29 @@ #include #endif +#if defined(_MSC_VER) +#include +#include +#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 +#include +#include +#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" @@ -73,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; } @@ -86,11 +153,11 @@ 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; @@ -113,7 +180,7 @@ static int send_int64_lbo(OXFILE *oxfp, double int64) /* receiving an object of int64 type with Network Byte Order. */ static double receive_int64_nbo_le(OXFILE *oxfp) { - int tag; + double tag; oxf_read(&tag, sizeof(double), 1, oxfp); return htonll_le(tag); } @@ -121,7 +188,7 @@ static double receive_int64_nbo_le(OXFILE *oxfp) /* receiving an object of int64 type with Local Byte Order. */ static double receive_int64_lbo(OXFILE *oxfp) { - int tag; + double tag; oxf_read(&tag, sizeof(double), 1, oxfp); return tag; } @@ -228,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; } } @@ -353,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) { @@ -396,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) {