summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--io.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f6cdccd868..e844d180b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 29 01:18:18 2004 Tanaka Akira <akr@m17n.org>
+
+ * io.c (rb_io_check_writable): restrict io_seek by
+ READ_DATA_PENDING because io_seek(fptr, 0, SEEK_CUR) is
+ meaningful only if read buffer is not empty.
+ call io_seek regardless of NEED_IO_SEEK_BETWEEN_RW.
+
Sat Nov 27 21:43:39 2004 Tanaka Akira <akr@m17n.org>
* io.c: avoid data lost with nonblocking fd and
diff --git a/io.c b/io.c
index a24faf964e..cc1b583955 100644
--- a/io.c
+++ b/io.c
@@ -251,11 +251,10 @@ rb_io_check_writable(fptr)
if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing");
}
-#if NEED_IO_SEEK_BETWEEN_RW
- if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
+ if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2 &&
+ READ_DATA_PENDING(fptr->f)) {
io_seek(fptr, 0, SEEK_CUR);
}
-#endif
if (!fptr->f2) {
fptr->mode &= ~FMODE_RBUF;
}