[os2/process]: Don't quote arguments unless needed #4272
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
flysand7
force-pushed
the
os2-noquote
branch
from
f38cf5a
to
6a020c0
Compare
flysand7
force-pushed
the
os2-noquote
branch
from
6a020c0
to
ee02d04
Compare
laytan
reviewed
Oct 4, 2024
core/os/os2/process_windows.odin
Outdated
| QUOTED_CHARS :: "()[]{}^=;!'+,`~\" " | ||
|
|
||
| @(private) | ||
| _char_needs_escape :: proc(ch: u8) -> bool { |
There was a problem hiding this comment.
This function seems unused?
core/os/os2/process_windows.odin
Outdated
| backslashes := 0 | ||
| for j < len(arg) && arg[j] == '\\' { | ||
| backslashes += 1 | ||
| arg_needs_quoting := false |
There was a problem hiding this comment.
Instead of this boolean and then the if statement to set the boolean and then the if statement with the boolean, why not just if !strings.contains_any(arg, QUOTED_CHARS) {.
core/os/os2/process_windows.odin
Outdated
| @@ -638,6 +638,19 @@ _parse_command_line :: proc(cmd_line_w: [^]u16, allocator: runtime.Allocator) -> | |||
| return | |||
| } | |||
|
|
|||
| @(private) | |||
| QUOTED_CHARS :: "()[]{}^=;!'+,`~\" " | |||
There was a problem hiding this comment.
I would personally put this inside the _build_command_line function
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.
This PR makes
os2.process_startavoid quoting command line arguments, unless they are quoted. The information about which characters need to be quoted is taken fromcmd/?help, but also space and a quote is added.This fixed the behavior of running
"cmd.exe" "/c" "<command>", where if/cflag is quoted, the cmd would refuse to understand the location of the command (Don't ask me I have no idea why that's a thing)