ruby-changes:4896
From: ko1@a...
Date: Mon, 12 May 2008 18:18:13 +0900 (JST)
Subject: [ruby-changes:4896] usa - Ruby:r16389 (trunk): * process.c (rb_spawn_internal): need to call run_exec_options() before
usa 2008-05-12 18:17:58 +0900 (Mon, 12 May 2008)
New Revision: 16389
Modified files:
trunk/ChangeLog
trunk/process.c
Log:
* process.c (rb_spawn_internal): need to call run_exec_options() before
spawn if the platform doesn't have fork. [ruby-dev:34647]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16389&r2=16388&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/process.c?r1=16389&r2=16388&diff_format=u
Index: ChangeLog
===================================================================
--- ChangeLog (revision 16388)
+++ ChangeLog (revision 16389)
@@ -1,3 +1,8 @@
+Mon May 12 18:16:44 2008 NAKAMURA Usaku <usa@r...>
+
+ * process.c (rb_spawn_internal): need to call run_exec_options() before
+ spawn if the platform doesn't have fork. [ruby-dev:34647]
+
Mon May 12 15:20:02 2008 Tanaka Akira <akr@f...>
* gc.c (ruby_vm_xmalloc): increase malloc_increase only if malloc
Index: process.c
===================================================================
--- process.c (revision 16388)
+++ process.c (revision 16389)
@@ -2565,26 +2565,29 @@
#if defined HAVE_FORK
status = rb_fork(&status, rb_exec_atfork, &earg, earg.redirect_fds);
if (prog && earg.argc) earg.argv[0] = prog;
-#elif defined HAVE_SPAWNV
+#else
+ if (run_exec_options(&earg) < 0) {
+ return -1;
+ }
+
argc = earg.argc;
argv = earg.argv;
+ if (prog && argc) argv[0] = prog;
+# if defined HAVE_SPAWNV
if (!argc) {
status = proc_spawn(RSTRING_PTR(prog));
}
else {
status = proc_spawn_n(argc, argv, prog);
}
- if (prog && argc) argv[0] = prog;
-#else
- argc = earg.argc;
- argv = earg.argv;
- if (prog && argc) argv[0] = prog;
+# else
if (argc) prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
status = system(StringValuePtr(prog));
-# if defined(__human68k__) || defined(__DJGPP__)
+# if defined(__human68k__) || defined(__DJGPP__)
rb_last_status_set(status == -1 ? 127 : status, 0);
-# else
+# else
rb_last_status_set((status & 0xff) << 8, 0);
+# endif
# endif
#endif
return status;
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/