diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | missing/close.c | 12 |
2 files changed, 16 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Tue Jul 13 12:04:57 2010 NARUSE, Yui <[email protected]> + + * missing/close.c: keep original errno. + Mon Jul 12 01:58:56 2010 Marc-Andre Lafortune <[email protected]> * lib/csv.rb: Fix unused variable warnings. diff --git a/missing/close.c b/missing/close.c index 7e743eb204..d87f9e3164 100644 --- a/missing/close.c +++ b/missing/close.c @@ -8,12 +8,15 @@ int ruby_getpeername(int s, struct sockaddr * name, socklen_t * namelen) { + int err = errno; errno = 0; s = getpeername(s, name, namelen); if (errno == ECONNRESET) { errno = 0; s = 0; } + else if (errno == 0) + errno = err; return s; } @@ -21,35 +24,44 @@ int ruby_getsockname(int s, struct sockaddr * name, socklen_t * namelen) { + int err = errno; errno = 0; s = getsockname(s, name, namelen); if (errno == ECONNRESET) { errno = 0; s = 0; } + else if (errno == 0) + errno = err; return s; } int ruby_shutdown(int s, int how) { + int err = errno; errno = 0; s = shutdown(s, how); if (errno == ECONNRESET) { errno = 0; s = 0; } + else if (errno == 0) + errno = err; return s; } int ruby_close(int s) { + int err = errno; errno = 0; s = close(s); if (errno == ECONNRESET) { errno = 0; s = 0; } + else if (errno == 0) + errno = err; return s; } |