kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (io_fflush): windows -- call fsync() only when the FD is tied to

Browse source 
file, because if the FD is pipe, it blocks.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2011-06-03 10:59:37 +00:00
parent 3862d95f0e
commit 19c78f9b9b
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jun 3 19:58:14 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (io_fflush): windows -- call fsync() only when the FD is tied to
file, because if the FD is pipe, it blocks.
Fri Jun 3 09:27:31 2011 NARUSE, Yui <naruse@ruby-lang.org> Fri Jun 3 09:27:31 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (URI::HTTP#request_uri): return nil when the uri * lib/net/http.rb (URI::HTTP#request_uri): return nil when the uri

6
io.c
View file

@ -683,7 +683,9 @@ io_fflush(rb_io_t *fptr)
rb_io_check_closed(fptr); rb_io_check_closed(fptr);
} }
#ifdef _WIN32 #ifdef _WIN32
fsync(fptr->fd); if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
fsync(fptr->fd);
}
#endif #endif
return 0; return 0;
} }
@ -1368,8 +1370,10 @@ rb_io_fsync(VALUE io)
if (io_fflush(fptr) < 0) if (io_fflush(fptr) < 0)
rb_sys_fail(0); rb_sys_fail(0);
#ifndef _WIN32 /* already called in io_fflush() */
if (fsync(fptr->fd) < 0) if (fsync(fptr->fd) < 0)
rb_sys_fail_path(fptr->pathv); rb_sys_fail_path(fptr->pathv);
#endif
return INT2FIX(0); return INT2FIX(0);
} }
#else #else