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

* io.c (rb_io_flush): fsync() after buffer is flushed on win32.

[ruby-core:20043]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-12-25 04:29:30 +00:00
parent a71fb38d47
commit f29ec7ed67
2 changed files with 18 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Thu Dec 25 13:28:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (rb_io_flush): fsync() after buffer is flushed on win32.
[ruby-core:20043]
Thu Dec 25 13:13:00 2008 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_method_search): return rb_cObject if there is no

15
io.c
View file

@ -983,6 +983,9 @@ rb_io_flush(VALUE io)
if (fptr->mode & FMODE_WRITABLE) {
io_fflush(fptr);
#ifdef _WIN32
fsync(fptr->fd);
#endif
}
if (fptr->mode & FMODE_READABLE) {
io_unread(fptr);
@ -4416,7 +4419,9 @@ popen_redirect(struct popen_arg *p)
}
}
}
#endif
#if defined(HAVE_FORK) || defined(_WIN32)
void
rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
{
@ -4433,12 +4438,16 @@ rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
if (ret != -1 && !(ret & FD_CLOEXEC)) {
fcntl(fd, F_SETFD, ret|FD_CLOEXEC);
}
#elif defined(_WIN32)
rb_w32_fd_noinherit(fd);
#else
close(fd);
#endif
}
}
#endif
#ifdef HAVE_FORK
static int
popen_exec(void *pp, char *errmsg, size_t errmsg_len)
{
@ -5922,13 +5931,15 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
fd = NUM2INT(fnum);
UPDATE_MAXFD(fd);
if (NIL_P(vmode)) {
#if defined(HAVE_FCNTL) && defined(F_GETFL)
if (NIL_P(vmode)) {
oflags = fcntl(fd, F_GETFL);
if (oflags == -1) rb_sys_fail(0);
fmode = rb_io_oflags_fmode(oflags);
#endif
}
#elif defined(_WIN32)
if (rb_w32_is_valid_fd(fd)) rb_sys_fail(0);
#endif
MakeOpenFile(io, fp);
fp->fd = fd;
fp->mode = fmode;