Merge pull request #21 from dreamedge/add_close_on_exec

Add close on exec

src/io.c

@@ -724,6 +724,94 @@ mrb_io_fileno(mrb_state *mrb, mrb_value io)
   return mrb_fixnum_value(fptr->fd);
 }
 
+void
+mrb_notimplement(mrb_state *mrb)
+{
+  mrb_raise(mrb, E_SCRIPT_ERROR, "unimplemented on this machine");
+  
+  return;
+}
+
+#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
+mrb_value
+mrb_io_close_on_exec_p(mrb_state *mrb, mrb_value io)
+{
+  struct mrb_io *fptr;
+  int ret;
+  
+  fptr = (struct mrb_io *)mrb_get_datatype(mrb, io, &mrb_io_type);
+  if(fptr->fd2 >= 0){
+    if ((ret = fcntl(fptr->fd2, F_GETFD)) == -1) mrb_sys_fail(mrb, "F_GETFD failed");
+    if (!(ret & FD_CLOEXEC)) return mrb_bool_value(0);
+  }
+
+  if(fptr->fd < 0){
+    mrb_raise(mrb, E_IO_ERROR, "closed stream");
+  } else {
+    if ((ret = fcntl(fptr->fd, F_GETFD)) == -1) mrb_sys_fail(mrb, "F_GETFD failed");
+    if (!(ret & FD_CLOEXEC)) return mrb_bool_value(0);
+  }
+
+  return mrb_bool_value(1);
+}
+#else
+#define mrb_io_close_on_exec_p mrb_f_notimplement
+mrb_f_notimplement(mrb_state *mrb, mrb_value io)
+{   
+	mrb_notimplement();
+
+  return -1;
+}
+#endif
+
+#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
+mrb_value
+mrb_io_set_close_on_exec(mrb_state *mrb, mrb_value io)
+{
+  mrb_bool bool;
+  int flag;
+  struct mrb_io *fptr;
+  int ret;
+
+  mrb_get_args(mrb, "b", &bool);
+  flag = bool ? FD_CLOEXEC : 0;
+
+  fptr = (struct mrb_io *)mrb_get_datatype(mrb, io, &mrb_io_type);
+
+  if(fptr->fd2 >= 0){
+    if ((ret = fcntl(fptr->fd2, F_GETFD)) == -1) mrb_sys_fail(mrb, "F_GETFD failed");
+    if ((ret & FD_CLOEXEC) != flag) {
+      ret = (ret & ~FD_CLOEXEC) | flag;
+      ret = fcntl(fptr->fd2, F_SETFD, ret);
+      
+      if (ret == -1) mrb_sys_fail(mrb, "F_SETFD failed");
+    }
+  }
+
+  if(fptr->fd < 0){
+    mrb_raise(mrb, E_IO_ERROR, "closed stream");
+  } else {
+    if ((ret = fcntl(fptr->fd, F_GETFD)) == -1) mrb_sys_fail(mrb, "F_GETFD failed");
+    if ((ret & FD_CLOEXEC) != flag) {
+      ret = (ret & ~FD_CLOEXEC) | flag;
+      ret = fcntl(fptr->fd, F_SETFD, ret);
+      if (ret == -1) mrb_sys_fail(mrb, "F_SETFD failed");
+    }
+  }
+
+  return mrb_nil_value();
+}
+#else
+#define mrb_io_close_on_exec mrb_f_notimplement
+mrb_f_notimplement(mrb_state *mrb, mrb_value io)
+{   
+	mrb_notimplement();
+
+  return -1;
+}
+#endif
+
+
 void
 mrb_init_io(mrb_state *mrb)
 {
@@ -749,5 +837,8 @@ mrb_init_io(mrb_state *mrb)
   mrb_define_method(mrb, io, "pid",        mrb_io_pid,        MRB_ARGS_NONE());   /* 15.2.20.5.2 */
   mrb_define_method(mrb, io, "fileno",     mrb_io_fileno,     MRB_ARGS_NONE());
 
+  mrb_define_method(mrb, io, "close_on_exec?",    mrb_io_close_on_exec_p,      MRB_ARGS_NONE());
+  mrb_define_method(mrb, io, "close_on_exec=",    mrb_io_set_close_on_exec,    MRB_ARGS_REQ(1));
+
   mrb_gv_set(mrb, mrb_intern_cstr(mrb, "$/"), mrb_str_new_cstr(mrb, "\n"));
 }

test/io.rb

@@ -342,6 +342,50 @@ assert('IO#fileno') do
   io.closed?
 end
 
+assert('IO#close_on_exec') do 
+  fd = IO.sysopen $mrbtest_io_wfname, "w"
+  io = IO.new fd, "w"
+  begin 
+    # IO.sysopen opens a file descripter without O_CLOEXEC flag.
+    assert_equal(false, io.close_on_exec?)
+  rescue ScriptError
+    skip "IO\#close_on_exec is not implemented."
+  end
+
+  io.close_on_exec = true
+  assert_equal(true, io.close_on_exec?)
+  io.close_on_exec = false
+  assert_equal(false, io.close_on_exec?)
+  io.close_on_exec = true
+  assert_equal(true, io.close_on_exec?)
+  
+  io.close
+  io.closed?
+
+  # # Use below when IO.pipe is implemented.
+  # begin 
+  #   r, w = IO.pipe
+  #   assert_equal(false, r.close_on_exec?)
+  #   r.close_on_exec = true
+  #   assert_equal(true, r.close_on_exec?)
+  #   r.close_on_exec = false
+  #   assert_equal(false, r.close_on_exec?)
+  #   r.close_on_exec = true
+  #   assert_equal(true, r.close_on_exec?)
+
+  #   assert_equal(false, w.close_on_exec?)
+  #   w.close_on_exec = true
+  #   assert_equal(true, w.close_on_exec?)
+  #   w.close_on_exec = false
+  #   assert_equal(false, w.close_on_exec?)
+  #   w.close_on_exec = true
+  #   assert_equal(true, w.close_on_exec?)
+  # ensure
+  #   r.close unless r.closed?
+  #   w.close unless w.closed?
+  # end
+end
+
 assert('`cmd`') do
   assert_equal `echo foo`, "foo\n"
 end