diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | io.c | 15 |
2 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Nov 7 23:39:23 2011 Tajima Akio <artonx@yahoo.co.jp> + + * io.c (io_fflush): remove fsync(). + * io.c (rb_io_flush, rb_io_rewind): fsync() here. + These pathces are backports of trunk r33651 for [Bug #5585] + Mon Oct 10 22:33:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * test/-ext-/old_thread_select/test_old_thread_select.rb: @@ -684,11 +684,6 @@ io_fflush(rb_io_t *fptr) return -1; rb_io_check_closed(fptr); } -#ifdef _WIN32 - if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) { - fsync(fptr->fd); - } -#endif return 0; } @@ -1067,6 +1062,11 @@ rb_io_flush(VALUE io) if (fptr->mode & FMODE_WRITABLE) { if (io_fflush(fptr) < 0) rb_sys_fail(0); +#ifdef _WIN32 + if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) { + fsync(fptr->fd); + } +#endif } if (fptr->mode & FMODE_READABLE) { io_unread(fptr); @@ -1199,6 +1199,11 @@ rb_io_rewind(VALUE io) GetOpenFile(io, fptr); if (io_seek(fptr, 0L, 0) < 0 && errno) rb_sys_fail_path(fptr->pathv); +#ifdef _WIN32 + if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) { + fsync(fptr->fd); + } +#endif if (io == ARGF.current_file) { ARGF.lineno -= fptr->lineno; } |