summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-10 03:46:09 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-10 03:46:09 +0000
commitc39fd4c34056fbebafc5ccfb3d63612538d3f234 (patch)
treedff1ccaa14c5196045d5a04ebbcdefd1b856ad2a /process.c
parentc27edd4a6e78d2545f67f1e04537f48ec2d8af10 (diff)
* process.c (rb_f_exec): call rb_exec_async_signal_safe except on
Mac OS X. cf. the comment in before_exec_non_async_signal_safe. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/process.c b/process.c
index 619f6a9f04..451650da0f 100644
--- a/process.c
+++ b/process.c
@@ -1014,7 +1014,7 @@ static void before_exec_non_async_signal_safe(void)
/*
* On Mac OS X 10.5.x (Leopard) or earlier, exec() may return ENOTSUPP
* if the process have multiple threads. Therefore we have to kill
- * internal threads temporary. [ruby-core: 10583]
+ * internal threads temporary. [ruby-core:10583]
*/
rb_thread_stop_timer_thread(0);
}
@@ -2028,7 +2028,11 @@ rb_f_exec(int argc, VALUE *argv)
rb_exec_arg_prepare(&earg, argc, argv);
+#ifdef __MacOS_X__
rb_exec_err(&earg, errmsg, sizeof(errmsg));
+#else
+ rb_exec_async_signal_safe(&earg, errmsg, sizeof(errmsg));
+#endif
if (errmsg[0])
rb_sys_fail(errmsg);
rb_sys_fail_str(earg.use_shell ? earg.invoke.sh.shell_script : earg.invoke.cmd.command_name);