diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-09 00:52:15 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-09 00:52:15 +0000 |
commit | 984a73a3c7df8b13bf5a2d19dfef8a55f89c0e9c (patch) | |
tree | 7b7db0dbbeb90136b7548e99f3a25be708a70903 | |
parent | 15fd3268a7274f9bb919bfe42eb663448bdb3969 (diff) |
merge revision(s) 21913:
* io.c (io_getpartial): fflush after read for updating pos in FILE.
not portable, I guess. [ruby-core:21561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Mar 9 09:51:19 2009 Tanaka Akira <akr@fsij.org> + + * io.c (io_getpartial): fflush after read for updating pos in FILE. + not portable, I guess. [ruby-core:21561] + Mon Mar 9 09:03:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * gc.c (define_final): cannot define finalizer for immediate @@ -1275,6 +1275,8 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock) goto again; rb_sys_fail(fptr->path); } + if (fptr->f) /* update pos in FILE structure [ruby-core:21561] */ + fflush(fptr->f); } rb_str_resize(str, n); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-03-09" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090309 -#define RUBY_PATCHLEVEL 357 +#define RUBY_PATCHLEVEL 358 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |