Skip to content

Add shims for env var emulation in Windows #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 27, 2020
Merged

Add shims for env var emulation in Windows #1225

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fa0700
Windows shims for env var emulation
JOE1994 Mar 13, 2020
cf5822a
exclude 'TERM' env_var to avoid terminfo trying to open the termcap file
JOE1994 Mar 24, 2020
2051805
follow-up to reviews
JOE1994 Mar 25, 2020
4e38fbe
follow-up2 to review (few issues not resolved yet)
JOE1994 Mar 25, 2020
f3e3af4
adjust to change of 'fn write_os_str_to_wide_str'
JOE1994 Mar 27, 2020
eaca17f
add reference to issue#1013
JOE1994 Mar 27, 2020
3fe71df
Modify reference to issue 1013
JOE1994 Mar 27, 2020
ea836ee
remove or update 'ignore-windows' annotations in some tests
JOE1994 Mar 27, 2020
579b3c4
adjust MemoryKind comment
RalfJung Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/shims/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ impl<'tcx> EnvVars<'tcx> {
) -> InterpResult<'tcx> {
let target_os = ecx.tcx.sess.target.target.target_os.as_str();
if target_os == "windows" {
// Exclude `TERM` var to avoid terminfo trying to open the termcap file.
// Temporary hack: Exclude `TERM` var to avoid terminfo trying to open the termcap file.
// Can be removed once Issue#1013(Implement file system access for Windows) is resolved.
excluded_env_vars.push("TERM".to_owned());
}

if ecx.machine.communicate {
for (name, value) in env::vars() {
if !excluded_env_vars.contains(&name) {
Expand Down