diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-15 00:29:10 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-15 00:29:10 +0000 |
| commit | bfb7fe417d65efc97305e738e4a74b51bb438a55 (patch) | |
| tree | bfc2059ea58b150c93d1c317c4dd7303e07e2cd4 | |
| parent | bccaca912920a705077e689f35ef2ab8cdfd7250 (diff) | |
| download | ruby-bfb7fe417d65efc97305e738e4a74b51bb438a55.tar.gz ruby-bfb7fe417d65efc97305e738e4a74b51bb438a55.tar.xz ruby-bfb7fe417d65efc97305e738e4a74b51bb438a55.zip | |
* ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK
flag in st_mode of struct stat. so, use rb_w32_issocket() function
instead of S_ISSOCK macro.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/init.c | 5 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Thu Oct 15 09:25:07 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK + flag in st_mode of struct stat. so, use rb_w32_issocket() function + instead of S_ISSOCK macro. + Thu Oct 15 00:47:42 2009 NARUSE, Yui <naruse@ruby-lang.org> * tool/enc-unicode.rb, diff --git a/ext/socket/init.c b/ext/socket/init.c index 85cc3de4f..b143dccd5 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -45,10 +45,15 @@ rsock_init_sock(VALUE sock, int fd) rb_io_t *fp; struct stat sbuf; +#ifndef _WIN32 if (fstat(fd, &sbuf) < 0) rb_sys_fail(0); if (!S_ISSOCK(sbuf.st_mode)) rb_raise(rb_eArgError, "not a socket file descriptor"); +#else + if (!rb_w32_is_socket(fd)) + rb_raise(rb_eArgError, "not a socket file descriptor"); +#endif MakeOpenFile(sock, fp); fp->fd = fd; |