TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-09 23:39:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

os: fix os.execute stderr redirection (fix #20986) (#21404)

Browse Source
This commit is contained in:
Henrik Holst 2024-05-02 17:16:02 -04:00 committed by GitHub
parent 4dc46ed9e6
commit c7fb7553b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/os/os_nix.c.v
View File

@ -339,10 +339,7 @@ pub fn mkdir(path string, params MkdirParams) ! {
// execute starts the specified command, waits for it to complete, and returns its output. // execute starts the specified command, waits for it to complete, and returns its output.
@[manualfree] @[manualfree]
pub fn execute(cmd string) Result { pub fn execute(cmd string) Result {
// if cmd.contains(';') || cmd.contains('&&') || cmd.contains('||') || cmd.contains('\n') { pcmd := 'exec 2>&1;${cmd}'
// return Result{ exit_code: -1, output: ';, &&, || and \\n are not allowed in shell commands' }
// }
pcmd := if cmd.contains('2>') { cmd.clone() } else { '${cmd} 2>&1' }
defer { defer {
unsafe { pcmd.free() } unsafe { pcmd.free() }
} }

10
vlib/os/os_test.c.v
View File

@ -907,6 +907,16 @@ fn test_execute_with_stderr_redirection() {
assert os.exists(stderr_path) assert os.exists(stderr_path)
} }
fn test_execute_with_linefeeds() {
if os.user_os() == 'windows' {
return
}
result := os.execute('true\n')
assert result.exit_code == 0
result2 := os.execute('false\n')
assert result2.exit_code == 1
}
fn test_command() { fn test_command() {
if os.user_os() == 'windows' { if os.user_os() == 'windows' {
eprintln('>>> os.Command is not implemented fully on Windows yet') eprintln('>>> os.Command is not implemented fully on Windows yet')