izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify and fix handling of incomplete substitution strings

Browse Source
This commit is contained in:
Cameron Gutman
2024-02-10 00:04:54 -06:00
parent cd2153f340
commit 11c8cf176c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/windows/misc.cpp
+7 -5
View File
@@ -711,13 +711,15 @@ namespace platf {
while ((match_pos = cmd_string.find_first_of(L'%', match_pos)) != std::wstring::npos) { while ((match_pos = cmd_string.find_first_of(L'%', match_pos)) != std::wstring::npos) {
std::wstring match_replacement; std::wstring match_replacement;
// Shell command replacements are strictly '%' followed by a single non-'%' character // If no additional character exists after the match, the dangling '%' is stripped
auto next_char = std::tolower(match_pos + 1 < cmd_string.size() ? cmd_string.at(match_pos + 1) : 0); if (match_pos + 1 == cmd_string.size()) {
switch (next_char) { cmd_string.erase(match_pos, 1);
// No next character
case 0:
break; break;
}
// Shell command replacements are strictly '%' followed by a single non-'%' character
auto next_char = std::tolower(cmd_string.at(match_pos + 1));
switch (next_char) {
// Escape character // Escape character
case L'%': case L'%':
// Skip this character and the next one // Skip this character and the next one