yugui	2009-01-16 00:36:15 +0900 (Fri, 16 Jan 2009)

  New Revision: 21541

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

  Log:
    merges r21506 from trunk into ruby_1_9_1.
    * win32/win32.c (rb_w32_aspawn): should not escape with carret
      unless using cmd.exe.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/win32.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21540)
+++ ruby_1_9_1/ChangeLog	(revision 21541)
@@ -1,3 +1,8 @@
+Wed Jan 14 13:19:21 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/win32.c (rb_w32_aspawn): should not escape with carret
+	  unless using cmd.exe.
+
 Tue Jan 13 02:21:43 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (internal_cmd_match): extracted from
Index: ruby_1_9_1/win32/win32.c
===================================================================
--- ruby_1_9_1/win32/win32.c	(revision 21540)
+++ ruby_1_9_1/win32/win32.c	(revision 21541)
@@ -1011,7 +1011,7 @@
 rb_w32_aspawn(int mode, const char *prog, char *const *argv)
 {
     int len, differ = 0, c_switch = 0;
-    BOOL ntcmd = FALSE;
+    BOOL ntcmd = FALSE, tmpnt;
     const char *shell;
     char *cmd, fbuf[MAXPATHLEN];
 
@@ -1019,7 +1019,8 @@
 
     if (!prog) prog = argv[0];
     if ((shell = getenv("COMSPEC")) &&
-	internal_cmd_match(prog, ntcmd = !is_command_com(shell))) {
+	internal_cmd_match(prog, tmpnt = !is_command_com(shell))) {
+	ntcmd = tmpnt;
 	prog = shell;
 	c_switch = 1;
 	differ = 1;

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