diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-10 08:02:38 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-10 08:02:38 +0000 |
| commit | 4f52d063d50ea50a2ff5c95f886c5ec3f9e6fe68 (patch) | |
| tree | 355ebc80626f5208417953bba9299b0b571166e5 /win32 | |
| parent | a887f96190f23b22fefcf3e588be61cdc833483e (diff) | |
| download | ruby-4f52d063d50ea50a2ff5c95f886c5ec3f9e6fe68.tar.gz ruby-4f52d063d50ea50a2ff5c95f886c5ec3f9e6fe68.tar.xz ruby-4f52d063d50ea50a2ff5c95f886c5ec3f9e6fe68.zip | |
* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
before calling original fclose()/close().
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index 3c8be568d..8d1f3e483 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3944,6 +3944,7 @@ rb_w32_fclose(FILE *fp) { int fd = fileno(fp); SOCKET sock = TO_SOCKET(fd); + int save_errno = errno; if (fflush(fp)) return -1; if (!is_socket(sock)) { @@ -3952,6 +3953,7 @@ rb_w32_fclose(FILE *fp) } _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE); fclose(fp); + errno = save_errno; if (closesocket(sock) == SOCKET_ERROR) { errno = map_errno(WSAGetLastError()); return -1; @@ -3963,6 +3965,7 @@ int rb_w32_close(int fd) { SOCKET sock = TO_SOCKET(fd); + int save_errno = errno; if (!is_socket(sock)) { UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN); @@ -3970,6 +3973,7 @@ rb_w32_close(int fd) } _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE); _close(fd); + errno = save_errno; if (closesocket(sock) == SOCKET_ERROR) { errno = map_errno(WSAGetLastError()); return -1; |