* replace of check EPIPE error(in getc()) rutine on bcc32.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
H_Konishi 2002-08-20 13:03:22 +00:00
parent 514aa4d976
commit 5738d62912
3 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
Tue Aug 20 21:47 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
* io.c (rb_io_fread): remove case EPIPE on bcc32 .
* win32/win32.c (rb_w32_getc): clear EPIPE error on bcc32.
Tue Aug 20 19:39:03 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* file.c (rb_file_s_expand_path): accept drive letter on Cygwin.

3
io.c
View File

@ -588,9 +588,6 @@ rb_io_fread(ptr, len, f)
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
#ifdef __BORLANDC__
case EPIPE:
#endif
return len - n;
}

View File

@ -2761,6 +2761,12 @@ int rb_w32_getc(FILE* stream)
}
else {
c = _filbuf(stream);
#ifdef __BORLANDC__
if( ( c == EOF )&&( errno == EPIPE ) )
{
clearerr(stream);
}
#endif
rb_trap_immediate = trap_immediate;
catch_interrupt();
}