From e1b51ee768567c1094c1c845936a7f60d1cb6115 Mon Sep 17 00:00:00 2001
From: PaulHigin <paulhi@microsoft.com>
Date: Tue, 8 Aug 2017 13:06:52 -0700
Subject: [PATCH] Fixes KeyFilePath parameter for Linux systems

---
 .../remoting/common/RunspaceConnectionInfo.cs | 30 ++++++++++++++++++-
 .../fanin/OutOfProcTransportManager.cs        |  6 ++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index aeaa379110f..e444e1e272f 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -2217,7 +2217,35 @@ private static string[] ParseArgv(ProcessStartInfo psi)
         {
             var argvList = new List<string>();
             argvList.Add(psi.FileName);
-            argvList.AddRange(psi.Arguments.Split(' '));
+
+            var argsToParse = psi.Arguments.Trim();
+            var argsLength = argsToParse.Length;
+            for (int i=0; i<argsLength; )
+            {
+                var iStart = i;
+         
+                switch (argsToParse[i])
+                {
+                    case '"':
+                        // Special case for arguments within quotes
+                        // Just return argument value within the quotes
+                        while ((++i < argsLength) && argsToParse[i] != '"') { };
+                        if (iStart < argsLength - 1)
+                        {
+                            iStart++;
+                        }
+                        break;
+
+                    default:
+                        // Common case for parsing arguments with space character delimiter
+                        while ((++i < argsLength) && argsToParse[i] != ' ') { };
+                        break;
+                }
+
+                argvList.Add(argsToParse.Substring(iStart, (i-iStart)));
+                while ((++i < argsLength) && argsToParse[i] == ' ') { };
+            }
+
             return argvList.ToArray();
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index be46f4532d4..d665c6d77a9 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -1461,6 +1461,12 @@ internal override void CreateAsync()
             StartReaderThread(_stdOutReader);
         }
 
+        internal override void CloseAsync()
+        {
+            base.CloseAsync();
+            CloseConnection();
+        }
+
         #endregion
 
         #region Private Methods