From a9e2fac0d06429b78c1d72e365ac5942a63ed301 Mon Sep 17 00:00:00 2001 From: Sorah Fukumori Date: Thu, 31 Aug 2017 15:47:25 +0900 Subject: [PATCH] File#path: Raise IOError when a file is O_TMPFILE File#path for a file opened with O_TMPFILE has no meaning. A filepath returned by this method isn't guarranteed about its accuracy, but files opened with O_TMPFILE are known its recorded path has no meaning. So let them not to return any pathname. After a discussion in ruby-core, just returning Qnil makes guessing the root cause difficult. Instead, this patch makes the method to raise an error. Other consideration is calling fnctl(2) on rb_file_path, but it adds a overhead, and it's difficult to determine O_TMPFILE status after fd has been closed. [Feature #13568] * io.c(rb_file_open_generic): Set Qnil to fptr->pathv when opening a file using O_TMPFILE * file.c(rb_file_path): Raise IOError when fptr->pathv is Qnil * file.c(rb_file_path): [DOC] Update for the new behavior --- file.c | 11 +++++++++-- io.c | 12 ++++++++++-- test/ruby/test_file.rb | 12 ++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/file.c b/file.c index 46593e0..02ec141 100644 --- a/file.c +++ b/file.c @@ -379,7 +379,10 @@ apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, vo * not normalize the name. * * The pathname may not point the file corresponding to file. - * e.g. file has been moved, deleted, or created with File::TMPFILE option. + * For instance, pathname becomes inaccurate when file has been moved or deleted. + * + * This method raises IOError for a file created using + * File::Constants::TMPFILE because they don't have a pathname. * * File.new("testfile").path #=> "testfile" * File.new("/tmp/../tmp/xxx", "w").path #=> "/tmp/../tmp/xxx" @@ -393,7 +396,11 @@ rb_file_path(VALUE obj) fptr = RFILE(rb_io_taint_check(obj))->fptr; rb_io_check_initialized(fptr); - if (NIL_P(fptr->pathv)) return Qnil; + + if (NIL_P(fptr->pathv)) { + rb_raise(rb_eIOError, "File is unnamed (TMPFILE?)"); + } + return rb_obj_taint(rb_str_dup(fptr->pathv)); } diff --git a/io.c b/io.c index 60af120..564819a 100644 --- a/io.c +++ b/io.c @@ -5813,6 +5813,7 @@ static VALUE rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode, const convconfig_t *convconfig, mode_t perm) { + VALUE pathv; rb_io_t *fptr; convconfig_t cc; if (!convconfig) { @@ -5828,8 +5829,15 @@ rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode, MakeOpenFile(io, fptr); fptr->mode = fmode; fptr->encs = *convconfig; - fptr->pathv = rb_str_new_frozen(filename); - fptr->fd = rb_sysopen(fptr->pathv, oflags, perm); + pathv = rb_str_new_frozen(filename); +#ifdef O_TMPFILE + if (!(oflags & O_TMPFILE)) { + fptr->pathv = pathv; + } +#else + fptr->pathv = pathv; +#endif + fptr->fd = rb_sysopen(pathv, oflags, perm); io_check_tty(fptr); if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io); diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index 58a4240..bb366ce 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -468,4 +468,16 @@ def test_open_nul assert_file.not_exist?(path) end end + + def test_open_tempfile_path + Dir.mktmpdir(__method__.to_s) do |tmpdir| + File.open(tmpdir, File::RDWR | File::TMPFILE) do |io| + io.write "foo" + io.flush + assert_equal 3, io.size + assert_raise(IOError) { io.path } + end + end + end if File::Constants.const_defined?(:TMPFILE) + end -- 2.10.2