1 files changed, 51 insertions, 4 deletions

diff --git a/src/io.c b/src/io.c
index a550fdf67..5e4ec6e7d 100644
--- a/src/io.c
+++ b/src/io.c
@@ -729,7 +729,7 @@ mrb_notimplement(mrb_state *mrb)
 {
   mrb_raise(mrb, E_SCRIPT_ERROR, "unimplemented on this machine");
   
-  return -1;
+  return;
 }
 
 #if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
@@ -737,8 +737,7 @@ mrb_value
 mrb_io_close_on_exec_p(mrb_state *mrb, mrb_value io)
 {
   struct mrb_io *fptr;
-  mrb_value write_io;
-  int fd, ret;
+  int ret;
   
   fptr = (struct mrb_io *)mrb_get_datatype(mrb, io, &mrb_io_type);
   if(fptr->fd2 >= 0){
@@ -765,6 +764,54 @@ mrb_f_notimplement(mrb_state *mrb, mrb_value io)
 }
 #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)
 {
@@ -791,7 +838,7 @@ mrb_init_io(mrb_state *mrb)
   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_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"));
 }