From ade7714d20c5fe1cee55ed7a9b939de5dfefdbc7 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 9 Nov 2009 23:23:23 +0000 Subject: [PATCH] * process.c (rb_f_exec, rb_f_system, rb_f_spawn): mentioned about the shell to be used when the command line is single string. See [ruby-core:26652] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ process.c | 13 ++++++++++--- version.h | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index eea5d2e9f4..001b5ea2ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 10 08:23:21 2009 Nobuyoshi Nakada + + * process.c (rb_f_exec, rb_f_system, rb_f_spawn): mentioned abou + the shell to be used when the command line is single string. + See [ruby-core:26652] + Mon Nov 9 20:15:16 2009 Tanaka Akira * thread.c (rb_gc_save_machine_context): don't save the stack pointer diff --git a/process.c b/process.c index 3cd39c8a8b..28b79b11c9 100644 --- a/process.c +++ b/process.c @@ -1729,13 +1729,17 @@ rb_exec_arg_fixup(struct rb_exec_arg *e) * Replaces the current process by running the given external _command_. * _command..._ is one of following forms. * - * commandline : command line string which is passed to a shell + * commandline : command line string which is passed to the standard shell * cmdname, arg1, ... : command name and one or more arguments (no shell) * [cmdname, argv0], arg1, ... : command name, argv[0] and zero or more arguments (no shell) * * If single string is given as the command, * it is taken as a command line that is subject to shell expansion before being executed. * + * The standard shell means always "/bin/sh" on Unix-like systems, + * ENV["RUBYSHELL"] or "cmd.exe" on Windows NT series, and + * similar. + * * If two or more +string+ given, * the first is taken as a command name and * the rest are passed as parameters to command with no shell expansion. @@ -2915,7 +2919,7 @@ rb_spawn(int argc, VALUE *argv) * Executes _command..._ in a subshell. * _command..._ is one of following forms. * - * commandline : command line string which is passed to a shell + * commandline : command line string which is passed to the standard shell * cmdname, arg1, ... : command name and one or more arguments (no shell) * [cmdname, argv0], arg1, ... : command name, argv[0] and zero or more arguments (no shell) * @@ -2937,6 +2941,8 @@ rb_spawn(int argc, VALUE *argv) * * config.h main.rb * * + * + * See Kernel.exec for the standard shell. */ static VALUE @@ -2992,7 +2998,7 @@ rb_f_system(int argc, VALUE *argv) * name => val : set the environment variable * name => nil : unset the environment variable * command...: - * commandline : command line string which is passed to a shell + * commandline : command line string which is passed to the standard shell * cmdname, arg1, ... : command name and one or more arguments (no shell) * [cmdname, argv0], arg1, ... : command name, argv[0] and zero or more arguments (no shell) * options: hash @@ -3200,6 +3206,7 @@ rb_f_system(int argc, VALUE *argv) * Internally, +spawn+ uses an extra file descriptor to resolve such cyclic * file descriptor mapping. * + * See Kernel.exec for the standard shell. */ static VALUE diff --git a/version.h b/version.h index d6ccf28873..c047810571 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-11-09" +#define RUBY_RELEASE_DATE "2009-11-10" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h"