From 88d8a68fc875757d88a4740e39b225f362678a69 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 8 Aug 2009 15:33:32 +0000 Subject: merges r24389 from trunk into ruby_1_9_1. -- * win32/win32.c (has_redirection): need to execute shell if commandline includes newline. cf. [ruby-core:24560] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- win32/win32.c | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65c19e90b..b47026276 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 4 22:10:34 2009 NAKAMURA Usaku + + * win32/win32.c (has_redirection): need to execute shell if commandline + includes newline. cf. [ruby-core:24560] + Tue Aug 4 05:43:03 2009 Yukihiro Matsumoto * thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997] diff --git a/version.h b/version.h index d81da7f4b..553a50f7e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 269 +#define RUBY_PATCHLEVEL 270 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/win32/win32.c b/win32/win32.c index bf405e0e6..b461a78b0 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1133,8 +1133,8 @@ has_redirection(const char *cmd) const char *ptr; // - // Scan the string, looking for redirection (< or >) or pipe - // characters (|) that are not in a quoted string + // Scan the string, looking for redirection characters (< or >), pipe + // character (|) or newline (\n) that are not in a quoted string // for (ptr = cmd; *ptr;) { @@ -1151,6 +1151,7 @@ has_redirection(const char *cmd) case '>': case '<': case '|': + case '\n': if (!quote) return TRUE; ptr++; -- cgit