From 98f09b9618e274106f336149a2ee81c939b2d870 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 8 Jun 2006 05:20:00 +0000 Subject: * win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions. use recv() and send() when fd is socket. fixed: [ruby-dev:28694] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 24 ++++++++++++++++++++++++ win32/win32.h | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index e756d1268c..bd53310101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 8 14:19:17 2006 NAKAMURA Usaku + + * win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions. + use recv() and send() when fd is socket. fixed: [ruby-dev:28694] + Wed Jun 7 14:53:04 2006 NAKAMURA Usaku * win32/win32.c (errmap): add some winsock errors. diff --git a/win32/win32.c b/win32/win32.c index 321c30384d..415dd42b7c 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3556,6 +3556,30 @@ rb_w32_close(int fd) return 0; } +#undef read +size_t +rb_w32_read(int fd, void *buf, size_t size) +{ + SOCKET sock = TO_SOCKET(fd); + + if (!is_socket(sock)) + return read(fd, buf, size); + else + return rb_w32_recv(fd, buf, size, 0); +} + +#undef write +size_t +rb_w32_write(int fd, const void *buf, size_t size) +{ + SOCKET sock = TO_SOCKET(fd); + + if (!is_socket(sock)) + return write(fd, buf, size); + else + return rb_w32_send(fd, buf, size, 0); +} + static int unixtime_to_filetime(time_t time, FILETIME *ft) { diff --git a/win32/win32.h b/win32/win32.h index 713ae32c02..8822a0b29e 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -118,6 +118,8 @@ extern DWORD rb_w32_osid(void); #define close(h) rb_w32_close(h) #define fclose(f) rb_w32_fclose(f) +#define read(f, b, s) rb_w32_read(f, b, s) +#define write(f, b, s) rb_w32_write(f, b, s) #define getpid() rb_w32_getpid() #define sleep(x) rb_w32_sleep((x)*1000) #ifdef __BORLANDC__ @@ -537,6 +539,8 @@ int rb_w32_putc(int, FILE*); int rb_w32_getc(FILE*); int rb_w32_close(int); int rb_w32_fclose(FILE*); +size_t rb_w32_read(int, void *, size_t); +size_t rb_w32_write(int, const void *, size_t); int rb_w32_utime(const char *, struct utimbuf *); #define Sleep(msec) (void)rb_w32_sleep(msec) -- cgit v1.2.3