bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't use posix_spawn() if PATH was modified in the environment.

Browse source 
The expected behavior is that the environment's PATH should be used
to find the process.  posix_spawn() could be used if we iterated
PATH to search for the binary to execute.  For now just skip
posix_spawn() if PATH is modified.
This commit is contained in:
Bryan Drewery 2018-03-19 15:40:09 -07:00
parent 00dac20e01
commit 6212904dd8
3 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstd/sys_common/process.rs
View file

@ -47,6 +47,7 @@ impl EnvKey for DefaultEnvKey {}
#[derive(Clone, Debug)]
pub struct CommandEnv<K> {
clear: bool,
saw_path: bool,
vars: BTreeMap<K, Option<OsString>>
}
@ -54,6 +55,7 @@ impl<K: EnvKey> Default for CommandEnv<K> {
fn default() -> Self {
CommandEnv {
clear: false,
saw_path: false,
vars: Default::default()
}
}
@ -108,9 +110,11 @@ impl<K: EnvKey> CommandEnv<K> {
// The following functions build up changes
pub fn set(&mut self, key: &OsStr, value: &OsStr) {
self.maybe_saw_path(&key);
self.vars.insert(key.to_owned().into(), Some(value.to_owned()));
}
pub fn remove(&mut self, key: &OsStr) {
self.maybe_saw_path(&key);
if self.clear {
self.vars.remove(key);
} else {
@ -121,4 +125,12 @@ impl<K: EnvKey> CommandEnv<K> {
self.clear = true;
self.vars.clear();
}
pub fn have_changed_path(&self) -> bool {
self.saw_path || self.clear
}
fn maybe_saw_path(&mut self, key: &OsStr) {
if !self.saw_path && key.to_os_string() == OsString::from("PATH") {
self.saw_path = true;
}
}
}