mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/win32.c (rb_w32_close): didn't close socket handle.
* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle never set EMFILE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8531657741
commit
160bfa5bef
2 changed files with 22 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
Thu Jan 6 19:59:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||
|
||||
* win32/win32.c (rb_w32_close): didn't close socket handle.
|
||||
|
||||
* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
|
||||
never set EMFILE.
|
||||
|
||||
Thu Jan 6 17:22:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||
|
||||
* random.c (random_seed): O_NONBLOCK isn't defined on some
|
||||
|
|
|
@ -88,7 +88,7 @@ static struct ChildRecord *CreateChild(const char *, const char *, SECURITY_ATTR
|
|||
static int has_redirection(const char *);
|
||||
static void StartSockets(void);
|
||||
static DWORD wait_events(HANDLE event, DWORD timeout);
|
||||
#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
|
||||
#if !defined(_WIN32_WCE)
|
||||
static int rb_w32_open_osfhandle(long osfhandle, int flags);
|
||||
#else
|
||||
#define rb_w32_open_osfhandle(osfhandle, flags) _open_osfhandle(osfhandle, flags)
|
||||
|
@ -1652,6 +1652,19 @@ rb_w32_open_osfhandle(long osfhandle, int flags)
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
static int
|
||||
rb_w32_open_osfhandle(long osfhandle, int flags)
|
||||
{
|
||||
int fd = _open_osfhandle(osfhandle, flags);
|
||||
if (fd == -1) {
|
||||
errno = EMFILE; /* too many open files */
|
||||
_doserrno = 0L; /* not an OS error */
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
#endif
|
||||
|
||||
#undef getsockopt
|
||||
|
||||
static int
|
||||
|
@ -3427,6 +3440,7 @@ rb_w32_close(int fd)
|
|||
return _close(fd);
|
||||
}
|
||||
_set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
|
||||
_close(fd);
|
||||
if (closesocket(sock) == SOCKET_ERROR) {
|
||||
errno = map_errno(WSAGetLastError());
|
||||
return -1;
|
||||
|
|
Loading…
Reference in a new issue