2004-05-19 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Process.cs: separate the command and the arguments when calling
	Start_internal.

svn path=/trunk/mcs/; revision=27695

2 files changed, 27 insertions, 6 deletions

diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index 0c0bedfbf1b..d8bb8741ceb 100644
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,13 +1,19 @@
 2004-05-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
+	* Process.cs: separate the command and the arguments when calling
+	Start_internal.
+
+2004-05-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
 	* Process.cs: redirecting I/O is not permitted if UseShellExecute is
 	false. Also throw if FileName is null.
 
 2004-04-06  Lluis Sanchez Gual  <lluis@ximian.com>
 
-	* DiagnosticsConfigurationHandler.cs: If initializeData is provided, use the
-	constructor that only takes one string as parameter to construct the 
-	listener. The name is set using the Name property, not the constructor.
+	* DiagnosticsConfigurationHandler.cs: If initializeData is provided,
+	use the constructor that only takes one string as parameter to
+	construct the listener. The name is set using the Name property, not the
+	constructor.
 	
 	* TextWriterTraceListener.cs: In Write*, do nothing if no writer was 
 	provided.
diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index eb7830ce646..54b594e83b7 100755
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -666,7 +666,8 @@ namespace System.Diagnostics {
 		}
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern static bool Start_internal(string cmd,
+		private extern static bool Start_internal(string appname,
+							  string cmdline,
 							  string dir,
 							  IntPtr stdin,
 							  IntPtr stdout,
@@ -734,8 +735,22 @@ namespace System.Diagnostics {
 				stderr_wr=MonoIO.ConsoleError;
 			}
 			
-			ret=Start_internal(startInfo.FileName + " " +
-					   startInfo.Arguments,
+			string cmdline;
+			string appname;
+			if (startInfo.UseShellExecute) {
+				appname = null;
+				string args = startInfo.Arguments;
+				if (args == null || args.Trim () == "")
+					cmdline = startInfo.FileName;
+				else
+					cmdline = startInfo.FileName + " " + startInfo.Arguments.Trim ();
+			} else {
+				appname = startInfo.FileName;
+				cmdline = startInfo.Arguments.Trim ();
+			}
+
+			ret=Start_internal(appname,
+					   cmdline,
 					   startInfo.WorkingDirectory,
 					   stdin_rd, stdout_wr, stderr_wr,
 					   ref proc_info);