kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (retry_sendfile, retry_read): ENOSYS and EWOULDBLOCK are not

Browse source 
defined on every platforms.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-08-05 03:44:09 +00:00
parent b84d31c524
commit f2aa0e5b0c
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Aug 5 12:43:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (retry_sendfile, retry_read): ENOSYS and EWOULDBLOCK are not
defined on every platforms.
Tue Aug 5 12:34:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* transcode_data.h (TRANSCODE_ERROR): common transcode failure

22
io.c
View file

@ -6590,9 +6590,16 @@ retry_sendfile:
}
}
if (ss == -1) {
if (errno == EINVAL || errno == ENOSYS)
switch (errno) {
case EINVAL:
#ifdef ENOSYS
case ENOSYS:
#endif
return 0;
if (errno == EAGAIN || errno == EWOULDBLOCK) {
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
if (copy_stream_wait_write(stp) == -1)
return -1;
if (RUBY_VM_INTERRUPTED(stp->th))
@ -6626,12 +6633,17 @@ retry_read:
return 0;
}
if (ss == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
switch (errno) {
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
if (copy_stream_wait_read(stp) == -1)
return -1;
goto retry_read;
}
if (errno == ENOSYS) {
#ifdef ENOSYS
case ENOSYS:
#endif
stp->notimp = "pread";
return -1;
}