akr	2012-06-09 01:13:26 +0900 (Sat, 09 Jun 2012)

  New Revision: 35967

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35967

  Log:
    * include/ruby/intern.h (rb_exec_arg_init): declaration changed to
      return a value.
    
    * process.c (rb_exec_arg_init): return a value.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/intern.h
    trunk/process.c

Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 35966)
+++ include/ruby/intern.h	(revision 35967)
@@ -608,7 +608,7 @@
     VALUE dup2_tmpbuf;
 };
 int rb_proc_exec(const char*);
-void rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e);
+VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e);
 int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val);
 void rb_exec_arg_fixup(struct rb_exec_arg *e);
 int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35966)
+++ ChangeLog	(revision 35967)
@@ -1,3 +1,10 @@
+Sat Jun  9 01:11:07 2012  Tanaka Akira  <akr@f...>
+
+	* include/ruby/intern.h (rb_exec_arg_init): declaration changed to
+	  return a value.
+
+	* process.c (rb_exec_arg_init): return a value.
+
 Fri Jun  8 23:44:14 2012  Tanaka Akira  <akr@f...>
 
 	* process.c: don't check the availability of FD_CLOEXEC.  It should
Index: process.c
===================================================================
--- process.c	(revision 35966)
+++ process.c	(revision 35967)
@@ -1850,13 +1850,14 @@
     }
 }
 
-void
+VALUE
 rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e)
 {
     VALUE prog;
     VALUE env = Qnil, opthash = Qnil;
     prog = rb_exec_getargs(&argc, &argv, accept_shell, &env, &opthash);
     rb_exec_fillarg(prog, argc, argv, env, opthash, e);
+    return e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name;
 }
 
 static int

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/