Skip to content

Added copy environment variables from ProcessStartInfo to key/pair array used in creating SSH process for remoting #7070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 1 commit into from
Jun 15, 2018
Merged

Added copy environment variables from ProcessStartInfo to key/pair array used in creating SSH process for remoting #7070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,7 +2182,7 @@ internal static int StartSSHProcess(

string filename = startInfo.FileName;
string[] argv = ParseArgv(startInfo);
string[] envp = new string[0];
string[] envp = CopyEnvVariables(startInfo);
string cwd = !string.IsNullOrWhiteSpace(startInfo.WorkingDirectory) ? startInfo.WorkingDirectory : null;

// Invoke the shim fork/execve routine. It will create pipes for all requested
Expand Down Expand Up @@ -2239,6 +2239,20 @@ private static FileStream OpenStream(int fd, FileAccess access)
access, StreamBufferSize, isAsync: false);
}

/// <summary>Copies environment variables from ProcessStartInfo </summary>
/// <param name="psi">ProcessStartInfo</param>
/// <returns>String array of environment key/value pairs</returns>
private static string[] CopyEnvVariables(ProcessStartInfo psi)
{
var envp = new string[psi.Environment.Count];
int index = 0;
foreach (var pair in psi.Environment)
{
envp[index++] = pair.Key + "=" + pair.Value;
}
return envp;
}

/// <summary>Converts the filename and arguments information from a ProcessStartInfo into an argv array.</summary>
/// <param name="psi">The ProcessStartInfo.</param>
/// <returns>The argv array.</returns>
Expand Down