1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: herdr maintainers <maintainers@herdr.dev>
Date: Sun, 5 Jul 2026 00:00:00 +0000
Subject: [PATCH] expose Windows raw command tails
Herdr launches user-authored custom command strings through the platform shell.
On Windows, cmd.exe expects the text after /c to remain shell syntax, but
portable-pty quotes every argv item with ArgvQuote. That escapes embedded
quotes in the command tail and changes cmd.exe parsing.
Herdr issue: https://github.com/herdrdev/herdr/issues/1041
Vendored base: portable-pty 0.9.0
---
vendor/portable-pty/src/cmdbuilder.rs | 40 +++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/vendor/portable-pty/src/cmdbuilder.rs b/vendor/portable-pty/src/cmdbuilder.rs
index 0000000..0000000 100644
--- a/vendor/portable-pty/src/cmdbuilder.rs
+++ b/vendor/portable-pty/src/cmdbuilder.rs
@@ -202,6 +202,8 @@ fn get_base_env() -> BTreeMap<OsString, EnvEntry> {
#[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))]
pub struct CommandBuilder {
args: Vec<OsString>,
+ #[cfg(windows)]
+ raw_args: Vec<OsString>,
envs: BTreeMap<OsString, EnvEntry>,
cwd: Option<OsString>,
#[cfg(unix)]
@@ -215,6 +217,8 @@ impl CommandBuilder {
pub fn new<S: AsRef<OsStr>>(program: S) -> Self {
Self {
args: vec![program.as_ref().to_owned()],
+ #[cfg(windows)]
+ raw_args: Vec::new(),
envs: get_base_env(),
cwd: None,
#[cfg(unix)]
@@ -227,6 +231,8 @@ impl CommandBuilder {
pub fn from_argv(args: Vec<OsString>) -> Self {
Self {
args,
+ #[cfg(windows)]
+ raw_args: Vec::new(),
envs: get_base_env(),
cwd: None,
#[cfg(unix)]
@@ -254,6 +260,8 @@ impl CommandBuilder {
pub fn new_default_prog() -> Self {
Self {
args: vec![],
+ #[cfg(windows)]
+ raw_args: Vec::new(),
envs: get_base_env(),
cwd: None,
#[cfg(unix)]
@@ -287,6 +295,15 @@ impl CommandBuilder {
}
}
+ /// Append raw shell text to the Windows command line without ArgvQuote escaping.
+ #[cfg(windows)]
+ pub fn raw_arg<S: AsRef<OsStr>>(&mut self, arg: S) {
+ if self.is_default_prog() {
+ panic!("attempted to add args to a default_prog builder");
+ }
+ self.raw_args.push(arg.as_ref().to_owned());
+ }
+
pub fn get_argv(&self) -> &Vec<OsString> {
&self.args
}
@@ -692,6 +709,15 @@ impl CommandBuilder {
);
Self::append_quoted(arg, &mut cmdline);
}
+ for arg in &self.raw_args {
+ cmdline.push(' ' as u16);
+ anyhow::ensure!(
+ !arg.encode_wide().any(|c| c == 0),
+ "invalid encoding for raw command line argument {:?}",
+ arg
+ );
+ cmdline.extend(arg.encode_wide());
+ }
// Ensure that the command line is nul terminated too!
cmdline.push(0);
Ok((exe, cmdline))
@@ -810,6 +836,29 @@ mod tests {
}
}
-
+
+ #[cfg(windows)]
+ #[test]
+ fn raw_arg_appends_unescaped_windows_command_tail() {
+ use std::os::windows::ffi::OsStringExt;
+
+ let mut cmd = CommandBuilder::new("cmd.exe");
+ cmd.arg("/d");
+ cmd.arg("/c");
+ cmd.raw_arg(r#"echo "hi""#);
+
+ let (_exe, cmdline) = cmd.cmdline().expect("command line");
+ let nul = cmdline
+ .iter()
+ .position(|ch| *ch == 0)
+ .expect("command line should be nul terminated");
+ let command = OsString::from_wide(&cmdline[..nul])
+ .to_string_lossy()
+ .into_owned();
+
+ assert!(command.ends_with(r#"/d /c echo "hi""#), "{}", command);
+ assert!(!command.contains(r#"\"hi\""#), "{}", command);
+ }
+
#[cfg(windows)]
#[test]
fn test_env_case_insensitive_override() {
|
