kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.

Browse source 
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
This commit is contained in:
usa 2006-06-08 05:20:00 +00:00
parent 75da7a9863
commit 98f09b9618
3 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jun 8 14:19:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* 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 <usa@ruby-lang.org>
* win32/win32.c (errmap): add some winsock errors.

24
win32/win32.c
View file

@ -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)
{

4
win32/win32.h
View file

@ -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)