Ensure PowerShell Core profile commandline is quoted #12086
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
Area-Settings
|
uuuuuuuuuugh thank you |
DHowett
added
zPreview-Service-Queued-1.13
DHowett
reviewed
Jan 4, 2022
Comment on lines
+313
to
+319
| const auto& unquotedCommandline = psI.executablePath.native(); | ||
| std::wstring quotedCommandline; | ||
| quotedCommandline.reserve(unquotedCommandline.size() + 2); | ||
| quotedCommandline.push_back(L'"'); | ||
| quotedCommandline.append(unquotedCommandline); | ||
| quotedCommandline.push_back(L'"'); | ||
| profile->Commandline(winrt::hstring{ quotedCommandline }); |
There was a problem hiding this comment.
for cheap tricks, we could also...
auto quotedCommandline = fmt::format(FMT_COMPILE(L"\"{}\""), psI.executablePath.native());
which should (?????) compile down to effectively optimal code (!)
There was a problem hiding this comment.
A micro-benchmark on my machine shows my code to be faster :)
auto start = std::chrono::steady_clock::now();
for (int i = 0; i < 1000000; i++)
{
const auto& unquotedCommandline = psI.executablePath.native();
std::wstring quotedCommandline;
quotedCommandline.reserve(unquotedCommandline.size() + 2);
quotedCommandline.push_back(L'"');
quotedCommandline.append(unquotedCommandline);
quotedCommandline.push_back(L'"');
profile->Commandline(winrt::hstring{ quotedCommandline });
}
auto end = std::chrono::steady_clock::now();
std::wstringstream stream;
stream << "Elapsed microseconds for native code " << std::chrono::duration_cast<std::chrono::microseconds>(end - start).count() << std::endl;
OutputDebugString(stream.str().c_str());
start = std::chrono::steady_clock::now();
for (int i = 0; i < 1000000; i++)
{
auto quotedCommandline = fmt::format(FMT_COMPILE(L"\"{}\""), psI.executablePath.native());
profile->Commandline(winrt::hstring{ quotedCommandline });
}
end = std::chrono::steady_clock::now();
std::wstringstream stream2;
stream2 << "Elapsed microseconds for fmt code " << std::chrono::duration_cast<std::chrono::microseconds>(end - start).count() << std::endl;
OutputDebugString(stream2.str().c_str());Output:
Elapsed microseconds for native code 234055
Elapsed microseconds for fmt code 258514
Edit: Run the loop a factor of 10 more times, and do something with the constructed string.
There was a problem hiding this comment.
A micro-benchmark on my machine shows my code to be faster :)
Well, you'll make @lhecker 's day. And I chuckled. Good enough.
DHowett
approved these changes
Jan 4, 2022
miniksa
approved these changes
Jan 4, 2022
DHowett
added
the
AutoMerge
|
Hello @DHowett! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
ghost
merged commit
DHowett
pushed a commit
that referenced
this pull request
Jan 21, 2022
Ensures the PowerShell Core profile's commandline is quoted. This allows the profile to work correctly if there are files in place on the machine (e.g. one called `C:\Program`) that prevent `CreateProcess()` from invoking the un-quoted commandline. ## Validation Steps Performed Created a file called `C:\Program` and opened the PowerShell profile in terminal. Closes #11717 (cherry picked from commit 4930508)
DHowett
removed
the
zPreview-Service-Queued-1.13
|
🎉 Handy links: |
ghost
mentioned this pull request
DHowett
removed
the
zStable-Service-Queued-1.12
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ensures the PowerShell Core profile's commandline is quoted. This allows
the profile to work correctly if there are files in place on the machine
(e.g. one called
C:\Program) that preventCreateProcess()frominvoking the un-quoted commandline.
Validation Steps Performed
Created a file called
C:\Programand opened the PowerShell profile interminal.
Closes #11717