summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH_Konishi <H_Konishi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-20 13:03:22 +0000
committerH_Konishi <H_Konishi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-20 13:03:22 +0000
commit5738d629122260c6ba0f99ac4cb9dfa486c17b7b (patch)
tree84e64ccc32a5f876e569e8d40cb050c49effd7b5
parent514aa4d97632f85d5dbd589d6bb37a49e8d1dbc4 (diff)
* 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
-rw-r--r--ChangeLog6
-rw-r--r--io.c3
-rw-r--r--win32/win32.c6
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a4a23f0d42..b5d68f844ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/io.c b/io.c
index 32203dca49b..01b7e2a72a6 100644
--- a/io.c
+++ b/io.c
@@ -589,9 +589,6 @@ rb_io_fread(ptr, len, f)
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
-#ifdef __BORLANDC__
- case EPIPE:
-#endif
return len - n;
}
return 0;
diff --git a/win32/win32.c b/win32/win32.c
index 94e7c456ad9..d10b68fbef7 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();
}