diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-14 03:46:26 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-14 03:46:26 +0000 |
commit | 4e9b6e308b51e3d723cb806773a38abae84f970f (patch) | |
tree | e5243808c6c6c7aab2dba1e6a0648e83c051aa6b | |
parent | b66bd2cc353cd209039cb2b3994eee12d326cb4b (diff) |
merges r28623 from trunk into ruby_1_9_2.
--
* missing/close.c: keep original errno.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 <naruse@ruby-lang.org> + + * missing/close.c: keep original errno. + Thu Jul 8 00:15:50 2010 Yusuke Endoh <mame@tsg.ne.jp> * gem_prelude.rb: provide workaround for gem activation. Currently, 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; } |