Merge pull request #474 in G/truffleruby from fix-dup-close-on-exec to master

* commit '86dadc7f325c9b8ad24998bd9b5d88097ee68ca9':
  Tag spuriously failing specs.
  Remove code for clearing the close-on-exec flag as the `dup2` function always clears that flag in the new FD.
  Update CHANGELOG for close-on-exec bug fixes.
  Remove an unnecessary guard wrapper.
  Reopened IO instances should always be set to close-on-exec.
  Dup'd IO instances should always be set to close-on-exec.

Author: nirvdrum

CHANGELOG.md

@@ -11,6 +11,9 @@ Bug fixes:
 * Adding missing support for the `close_others` option to `exec` and `spawn`.
 * Allow signal `0` to be used with `Process.kill`.
 * FFI::Pointer now does the correct range checks for signed and unsigned values.
+* Allow signal `0` to be used with `Process.kill` (#1474).
+* `IO#dup` now properly sets the new `IO` instance to be close-on-exec.
+* `IO#reopen` now properly resets the receiver to be close-on-exec.
 
 Changes:
 

lib/truffle/fcntl.rb

@@ -8,6 +8,7 @@
 
 module Fcntl
   F_DUPFD = Truffle::Config['platform.fcntl.F_DUPFD']
+  F_DUPFD_CLOEXEC = Truffle::Config['platform.fcntl.F_DUPFD_CLOEXEC']
   F_GETFD = Truffle::Config['platform.fcntl.F_GETFD']
   F_GETLK = Truffle::Config['platform.fcntl.F_GETLK']
   F_SETFD = Truffle::Config['platform.fcntl.F_SETFD']

spec/ruby/core/dir/shared/open.rb

@@ -61,7 +61,7 @@
     dir.should be_kind_of(Dir)
   end
 
-  guard -> { platform_is_not :windows } do
+  platform_is_not :windows do
     it 'sets the close-on-exec flag for the directory file descriptor' do
       Dir.send(@method, DirSpecs.mock_dir) do |dir|
         io = IO.for_fd(dir.fileno)

spec/ruby/core/file/reopen_spec.rb

@@ -25,7 +25,7 @@
     @file.read.should == @content_b
   end
 
-  it "calls #to_path to convern an Object" do
+  it "calls #to_path to convert an Object" do
     @file = File.new(@name_a).reopen(mock_to_path(@name_b), "r")
     @file.read.should == @content_b
   end

spec/ruby/core/io/dup_spec.rb

@@ -66,4 +66,12 @@
   it "raises IOError on closed stream" do
     lambda { IOSpecs.closed_io.dup }.should raise_error(IOError)
   end
+
+  it "always sets the close-on-exec flag for the new IO object" do
+    @f.close_on_exec = true
+    @f.dup.close_on_exec?.should == true
+
+    @f.close_on_exec = false
+    @f.dup.close_on_exec?.should == true
+  end
 end

spec/ruby/core/io/reopen_spec.rb

@@ -162,6 +162,18 @@
     end
   end
 
+  it "always resets the close-on-exec flag to true on non-STDIO objects" do
+    @io = new_io @name, "w"
+
+    @io.close_on_exec = true
+    @io.reopen @other_name
+    @io.close_on_exec?.should == true
+
+    @io.close_on_exec = false
+    @io.reopen @other_name
+    @io.close_on_exec?.should == true
+  end
+
   it "creates the file if it doesn't exist if the IO is opened in write mode" do
     @io = new_io @name, "w"
 
@@ -294,6 +306,18 @@ def @io.to_io; flunk; end
     File.read(@other_name).should == "io data"
   end
 
+  it "always resets the close-on-exec flag to true on non-STDIO objects" do
+    @other_io.close_on_exec = true
+    @io.close_on_exec = true
+    @io.reopen @other_io
+    @io.close_on_exec?.should == true
+
+    @other_io.close_on_exec = false
+    @io.close_on_exec = false
+    @io.reopen @other_io
+    @io.close_on_exec?.should == true
+  end
+
   it "may change the class of the instance" do
     @io.reopen @other_io
     @io.should be_an_instance_of(File)

spec/tags/core/process/spawn_tags.txt

@@ -88,3 +88,6 @@ ci:Process.spawn redirects STDOUT to the given file if out: String
 ci:Process.spawn redirects STDOUT to the given file if out: [String name, String mode]
 ci:Process.spawn redirects STDERR to the given file if err: String
 fails:Process.spawn raises an Errno::EACCES or Errno::EISDIR when passed a directory
+fails(spurious failure):Process.spawn when passed close_others: false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
+fails(spurious failure):Process.spawn when passed close_others: false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
+fails(spurious failure):Process.spawn when passed close_others: true closes file descriptors >= 3 in the child process even if fds are set close_on_exec=false

spec/tags/core/thread/raise_tags.txt

@@ -0,0 +1,2 @@
+fails(spurious failure):Thread#raise on a running thread can go unhandled
+

src/main/java/org/truffleruby/platform/darwin/DarwinNativeConfiguration.java

@@ -335,6 +335,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
         configuration.config("platform.fcntl.F_GETFL", 3);
         configuration.config("platform.fcntl.F_SETFL", 4);
         configuration.config("platform.fcntl.F_DUPFD", 0);
+        configuration.config("platform.fcntl.F_DUPFD_CLOEXEC", 67);
         configuration.config("platform.fcntl.F_GETFD", 1);
         configuration.config("platform.fcntl.F_SETFD", 2);
         configuration.config("platform.fcntl.FD_CLOEXEC", 1);

src/main/java/org/truffleruby/platform/linux/LinuxNativeConfiguration.java

@@ -335,6 +335,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
         configuration.config("platform.fcntl.F_GETFL", 3);
         configuration.config("platform.fcntl.F_SETFL", 4);
         configuration.config("platform.fcntl.F_DUPFD", 0);
+        configuration.config("platform.fcntl.F_DUPFD_CLOEXEC", 1030);
         configuration.config("platform.fcntl.F_GETFD", 1);
         configuration.config("platform.fcntl.F_SETFD", 2);
         configuration.config("platform.fcntl.FD_CLOEXEC", 1);