Always escape " in Process on Windows.

ajohnsen@google.com · ajohnsen@google.com · commit ff7d45d16f1c · 2013-06-20T14:50:33.000Z
BUG=https://code.google.com/p/dart/issues/detail?id=10895 R=sgjesse@google.com Review URL: https://codereview.chromium.org//17447015 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@24232 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/bin/process_patch.dart b/runtime/bin/process_patch.dart
@@ -92,8 +92,7 @@ class _ProcessImpl extends NativeFieldWrapperClass1 implements Process {
       }
       _arguments[i] = arguments[i];
       if (Platform.operatingSystem == 'windows') {
-        _arguments[i] = _windowsArgumentEscape(_arguments[i],
-                                               shellEscape: runInShell);
+        _arguments[i] = _windowsArgumentEscape(_arguments[i]);
       }
     }
 
@@ -158,12 +157,11 @@ class _ProcessImpl extends NativeFieldWrapperClass1 implements Process {
     return shellArguments;
   }
 
-  String _windowsArgumentEscape(String argument, { bool shellEscape: false }) {
+  String _windowsArgumentEscape(String argument) {
     var result = argument;
     if (argument.contains('\t') ||
         argument.contains(' ') ||
-        // TODO(ajohnsen): Remove shellEscape.
-        (shellEscape && argument.contains('"'))) {
+        argument.contains('"')) {
       // Produce something that the C runtime on Windows will parse
       // back as this string.
 

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ class _ProcessImpl extends NativeFieldWrapperClass1 implements Process {`
`92`	`92`	`}`
`93`	`93`	`_arguments[i] = arguments[i];`
`94`	`94`	`if (Platform.operatingSystem == 'windows') {`
`95`		`- _arguments[i] = _windowsArgumentEscape(_arguments[i],`
`96`		`- shellEscape: runInShell);`
	`95`	`+ _arguments[i] = _windowsArgumentEscape(_arguments[i]);`
`97`	`96`	`}`
`98`	`97`	`}`
`99`	`98`
`@@ -158,12 +157,11 @@ class _ProcessImpl extends NativeFieldWrapperClass1 implements Process {`
`158`	`157`	`return shellArguments;`
`159`	`158`	`}`
`160`	`159`
`161`		`- String _windowsArgumentEscape(String argument, { bool shellEscape: false }) {`
	`160`	`+ String _windowsArgumentEscape(String argument) {`
`162`	`161`	`var result = argument;`
`163`	`162`	`if (argument.contains('\t') \|\|`
`164`	`163`	`argument.contains(' ') \|\|`
`165`		`- // TODO(ajohnsen): Remove shellEscape.`
`166`		`- (shellEscape && argument.contains('"'))) {`
	`164`	`+ argument.contains('"')) {`
`167`	`165`	`// Produce something that the C runtime on Windows will parse`
`168`	`166`	`// back as this string.`
`169`	`167`