From 5738d629122260c6ba0f99ac4cb9dfa486c17b7b Mon Sep 17 00:00:00 2001 From: H_Konishi Date: Tue, 20 Aug 2002 13:03:22 +0000 Subject: [PATCH] * 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 --- ChangeLog | 6 ++++++ io.c | 3 --- win32/win32.c | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a4a23f0d4..b5d68f844e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 20 21:47 2002 KONISHI Hiromasa + + * 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 * file.c (rb_file_s_expand_path): accept drive letter on Cygwin. diff --git a/io.c b/io.c index 32203dca49..01b7e2a72a 100644 --- a/io.c +++ b/io.c @@ -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; } diff --git a/win32/win32.c b/win32/win32.c index 94e7c456ad..d10b68fbef 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -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(); }