admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Breaking change] Do not add PATHEXT environment variable on Unix (#7697)

Browse Source 
* Don't create env:PATHEXT on Unix
* Use IsExecutable()
* Add conditional compile
This commit is contained in:
Ilya
2018-09-14 08:03:56 +05:00
committed by GitHub
parent 8c10c1bcd1
commit f90fa8afc1
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/NativeCommandProcessor.cs
+14 -11
View File
@@ -1085,10 +1085,7 @@ namespace System.Management.Automation
ProcessStartInfo startInfo = new ProcessStartInfo();
startInfo.FileName = this.Path;
// On Windows, check the extension list and see if we should try to execute this directly.
// Otherwise, use the platform library to check executability
if ((Platform.IsWindows && ValidateExtension(this.Path))
|| (!Platform.IsWindows && Platform.NonWindowsIsExecutable(this.Path)))
if (IsExecutable(this.Path))
{
startInfo.UseShellExecute = false;
if (redirectInput)
@@ -1288,16 +1285,19 @@ namespace System.Management.Automation
}
}
private bool ValidateExtension(string path)
// On Windows, check the extension list and see if we should try to execute this directly.
// Otherwise, use the platform library to check executability
private bool IsExecutable(string path)
{
// Now check the extension and see if it's one of the ones in pathext
#if UNIX
return Platform.NonWindowsIsExecutable(this.Path);
#else
string myExtension = System.IO.Path.GetExtension(path);
string pathext = (string)LanguagePrimitives.ConvertTo(
this.Command.Context.GetVariableValue(SpecialVariables.PathExtVarPath),
typeof(string), CultureInfo.InvariantCulture);
var pathext = Environment.GetEnvironmentVariable("PATHEXT");
string[] extensionList;
if (String.IsNullOrEmpty(pathext))
if (string.IsNullOrEmpty(pathext))
{
extensionList = new string[] { ".exe", ".com", ".bat", ".cmd" };
}
@@ -1305,14 +1305,17 @@ namespace System.Management.Automation
{
extensionList = pathext.Split(Utils.Separators.Semicolon);
}
foreach (string extension in extensionList)
{
if (String.Equals(extension, myExtension, StringComparison.OrdinalIgnoreCase))
if (string.Equals(extension, myExtension, StringComparison.OrdinalIgnoreCase))
{
return true;
}
}
return false;
#endif
}
#region Interop for FindExecutable...
src/System.Management.Automation/engine/SpecialVariables.cs
+2 -2
View File
@@ -115,10 +115,10 @@ namespace System.Management.Automation
internal const string EventError = "error";
internal static readonly VariablePath EventErrorVarPath = new VariablePath("script:" + EventError);
#if !UNIX
internal const string PathExt = "env:PATHEXT";
internal static readonly VariablePath PathExtVarPath = new VariablePath(PathExt);
#endif
internal const string PSEmailServer = "PSEmailServer";
internal static readonly VariablePath PSEmailServerVarPath = new VariablePath(PSEmailServer);