X Tutup
Skip to content

Use OrdinalIgnoreCase in CommandLineParser #14303

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
daxian-dbw merged 1 commit into from
Dec 3, 2020
Merged

Use OrdinalIgnoreCase in CommandLineParser #14303

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
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ internal static string GetConfigurationNameFromGroupPolicy()
/// </returns>
private (string switchKey, bool shouldBreak) GetSwitchKey(string[] args, ref int argIndex, ref bool noexitSeen)
{
string switchKey = args[argIndex].Trim().ToLowerInvariant();
string switchKey = args[argIndex].Trim();
if (string.IsNullOrEmpty(switchKey))
{
return (switchKey: string.Empty, shouldBreak: false);
Expand Down Expand Up @@ -648,7 +648,7 @@ private static bool MatchSwitch(string switchKey, string match, string smallestU
Dbg.Assert(match.Contains(smallestUnambiguousMatch), "sUM should be a substring of match");

return (switchKey.Length >= smallestUnambiguousMatch.Length
&& match.IndexOf(switchKey, StringComparison.Ordinal) == 0);
&& match.StartsWith(switchKey, StringComparison.OrdinalIgnoreCase));
}

#endregion
Expand Down Expand Up @@ -1131,11 +1131,11 @@ static object ConvertToBoolIfPossible(string arg)
{
if (args[i].StartsWith('-') && args[i].Length > 1)
{
string param = args[i].Substring(1, args[i].Length - 1).ToLower();
string param = args[i].Substring(1, args[i].Length - 1);
StringBuilder possibleParameters = new StringBuilder();
foreach (string validParameter in s_validParameters)
{
if (validParameter.Contains(param))
if (validParameter.Contains(param, StringComparison.OrdinalIgnoreCase))
{
possibleParameters.Append("\n -");
possibleParameters.Append(validParameter);
Expand Down
X Tutup