From ec6cb67d037eb9f25f0e78215a07e4c6285f5739 Mon Sep 17 00:00:00 2001 From: eban Date: Thu, 27 May 2004 05:58:32 +0000 Subject: [PATCH] * io.c (rb_io_fwrite): workaround for bcc32's fwrite bug. add errno checking. [ruby-dev:23627] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72e1025a08..ca98d2c695 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 27 14:53:13 2004 WATANABE Hirofumi + + * io.c (rb_io_fwrite): workaround for bcc32's fwrite bug. + add errno checking. [ruby-dev:23627] + Thu May 27 11:25:03 2004 NAKAMURA, Hiroshi * test/csv/test_csv.rb: illegal require module name (../lib/csv.rb). diff --git a/io.c b/io.c index 5072366832..f3b83da7d4 100644 --- a/io.c +++ b/io.c @@ -400,7 +400,7 @@ rb_io_fwrite(ptr, len, f) long n, r; if ((n = len) <= 0) return n; -#ifdef __human68k__ +#if defined __human68k__ || defined __BORLANDC__ do { if (fputc(*ptr++, f) == EOF) { if (ferror(f)) return -1L; @@ -409,7 +409,11 @@ rb_io_fwrite(ptr, len, f) } while (--n > 0); #else while (errno = 0, ptr += (r = fwrite(ptr, 1, n, f)), (n -= r) > 0) { - if (ferror(f)) { + if (ferror(f) +#if defined __BORLANDC__ + || errno == EBAF +#endif + ) { #ifdef __hpux if (!errno) errno = EAGAIN; #endif