1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

O_EXCL has no meaning for fdopen

Browse Source 
"exclusive access mode is not supported" exception has resulted in
empty "rubyheap-*.json" files after test/objspace/test_objspace.rb.
This commit is contained in:
Nobuyoshi Nakada 2019-06-28 12:02:33 +09:00
parent 14b0c94ac3
commit ff7f71b288
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io.c
View File

@ -8037,7 +8037,7 @@ FILE *
rb_io_stdio_file(rb_io_t *fptr) rb_io_stdio_file(rb_io_t *fptr)
{ {
if (!fptr->stdio_file) { if (!fptr->stdio_file) {
int oflags = rb_io_fmode_oflags(fptr->mode); int oflags = rb_io_fmode_oflags(fptr->mode) & ~O_EXCL;
fptr->stdio_file = rb_fdopen(fptr->fd, rb_io_oflags_modestr(oflags)); fptr->stdio_file = rb_fdopen(fptr->fd, rb_io_oflags_modestr(oflags));
} }
return fptr->stdio_file; return fptr->stdio_file;

6
test/objspace/test_objspace.rb
View File

@ -406,10 +406,10 @@ class TestObjSpace < Test::Unit::TestCase
puts dump_my_heap_please puts dump_my_heap_please
end; end;
skip if /is not supported/ =~ error assert_nil(error)
skip error unless output dump = File.readlines(output)
assert_match(entry, File.readlines(output).grep(/TEST STRING/).join("\n"))
File.unlink(output) File.unlink(output)
assert_match(entry, dump.grep(/TEST STRING/).join("\n"))
end end
if defined?(JSON) if defined?(JSON)