[前][次][番号順一覧][スレッド一覧]

ruby-changes:18962

From: usa <ko1@a...>
Date: Tue, 1 Mar 2011 16:23:44 +0900 (JST)
Subject: [ruby-changes:18962] Ruby:r30995 (trunk): * win32/win32.c: revert r30987 because it causes some failures in

usa	2011-03-01 16:23:37 +0900 (Tue, 01 Mar 2011)

  New Revision: 30995

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

  Log:
    * win32/win32.c: revert r30987 because it causes some failures in
      test-all, especially webrick.

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30994)
+++ ChangeLog	(revision 30995)
@@ -1,3 +1,8 @@
+Tue Mar  1 16:22:22 2011  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c: revert r30987 because it causes some failures in
+	  test-all, especially webrick.
+
 Tue Mar  1 15:59:53 2011  NARUSE, Yui  <naruse@r...>
 
 	* string.c (rb_str_byteslice): the resulted encoding should keep
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 30994)
+++ win32/win32.c	(revision 30995)
@@ -851,9 +851,6 @@
 {
     char cmdname[9], *b = cmdname, c;
 
-    if (strchr(cmd, '^'))
-	return 1;
-
     do {
 	if (!(c = *cmd++)) return 0;
     } while (isspace(c));
@@ -1142,12 +1139,6 @@
 	    cmd = tmp;
 	}
 	else if ((shell = getenv("COMSPEC")) &&
-		 strchr(cmd, '"')) {
-	    char *tmp = ALLOCV(v, strlen(shell) + strlen(cmd) + sizeof(" /c "));
-	    sprintf(tmp, "%s /c %s", shell, cmd);
-	    cmd = tmp;
-	}
-	else if ((shell = getenv("COMSPEC")) &&
 		 (nt = !is_command_com(shell),
 		  (redir < 0 ? has_redirection(cmd) : redir) ||
 		  is_internal_cmd(cmd, nt))) {

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

[前][次][番号順一覧][スレッド一覧]