-use std::convert::TryFrom;
use std::env;
use std::ffi::{OsStr, OsString};
use std::io::ErrorKind;
if ecx.machine.communicate() || !config.forwarded_env_vars.is_empty() {
for (name, value) in env::vars_os() {
let forward = match ecx.machine.communicate() {
- true => !excluded_env_vars.iter().any(|v| v.as_str() == &name),
- false => config.forwarded_env_vars.iter().any(|v| v.as_str() == &name),
+ true => !excluded_env_vars.iter().any(|v| **v == name),
+ false => config.forwarded_env_vars.iter().any(|v| **v == name),
};
if forward {
let var_ptr = match target_os {
unsupported
),
};
- ecx.machine.env_vars.map.insert(OsString::from(name), var_ptr);
+ ecx.machine.env_vars.map.insert(name, var_ptr);
}
}
}
name_op: &OpTy<'tcx, Tag>,
value_op: &OpTy<'tcx, Tag>,
) -> InterpResult<'tcx, i32> {
- let mut this = self.eval_context_mut();
+ let this = self.eval_context_mut();
let target_os = &this.tcx.sess.target.os;
assert!(
target_os == "linux" || target_os == "macos",
}
}
if let Some((name, value)) = new {
- let var_ptr = alloc_env_var_as_c_str(&name, &value, &mut this)?;
+ let var_ptr = alloc_env_var_as_c_str(&name, &value, this)?;
if let Some(var) = this.machine.env_vars.map.insert(name, var_ptr) {
this.deallocate_ptr(var, None, MiriMemoryKind::Runtime.into())?;
}
name_op: &OpTy<'tcx, Tag>, // LPCWSTR
value_op: &OpTy<'tcx, Tag>, // LPCWSTR
) -> InterpResult<'tcx, i32> {
- let mut this = self.eval_context_mut();
+ let this = self.eval_context_mut();
this.assert_target_os("windows", "SetEnvironmentVariableW");
let name_ptr = this.read_pointer(name_op)?;
Ok(1) // return non-zero on success
} else {
let value = this.read_os_str_from_wide_str(value_ptr)?;
- let var_ptr = alloc_env_var_as_wide_str(&name, &value, &mut this)?;
+ let var_ptr = alloc_env_var_as_wide_str(&name, &value, this)?;
if let Some(var) = this.machine.env_vars.map.insert(name, var_ptr) {
this.deallocate_ptr(var, None, MiriMemoryKind::Runtime.into())?;
}
"`getcwd` is only available for the UNIX target family"
);
- let buf = this.read_pointer(&buf_op)?;
- let size = this.read_scalar(&size_op)?.to_machine_usize(&*this.tcx)?;
+ let buf = this.read_pointer(buf_op)?;
+ let size = this.read_scalar(size_op)?.to_machine_usize(&*this.tcx)?;
if let IsolatedOp::Reject(reject_with) = this.machine.isolated_op {
this.reject_in_isolation("`getcwd`", reject_with)?;
let target_os = &this.tcx.sess.target.os;
assert!(
target_os == "linux" || target_os == "macos",
- "`getcwd` is only available for the UNIX target family"
+ "`chdir` is only available for the UNIX target family"
);
let path = this.read_path_from_c_str(this.read_pointer(path_op)?)?;
Ok(())
}
+
+ fn getpid(&mut self) -> InterpResult<'tcx, i32> {
+ let this = self.eval_context_mut();
+ let target_os = &this.tcx.sess.target.os;
+ assert!(
+ target_os == "linux" || target_os == "macos",
+ "`getpid` is only available for the UNIX target family"
+ );
+
+ this.check_no_isolation("`getpid`")?;
+
+ // The reason we need to do this wacky of a conversion is because
+ // `libc::getpid` returns an i32, however, `std::process::id()` return an u32.
+ // So we un-do the conversion that stdlib does and turn it back into an i32.
+
+ Ok(std::process::id() as i32)
+ }
+
+ #[allow(non_snake_case)]
+ fn GetCurrentProcessId(&mut self) -> InterpResult<'tcx, u32> {
+ let this = self.eval_context_mut();
+ this.assert_target_os("windows", "GetCurrentProcessId");
+
+ this.check_no_isolation("`GetCurrentProcessId`")?;
+
+ Ok(std::process::id())
+ }
}