Skip to content

mktemp: treat empty TMPDIR as unset with a template #15836

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

Open
MannXo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mktemp: treat empty TMPDIR as unset with a template #15836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions src/uu/mktemp/src/mktemp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ impl Options {
(tmpdir, OsString::from(template))
}
Some(template) => {
let tmpdir = if let Some(tmpdir) = env::var_os(TMPDIR_ENV_VAR)
let tmpdir = if let Some(tmpdir) =
env::var_os(TMPDIR_ENV_VAR).filter(|dir| !dir.is_empty())
&& matches.get_flag(OPT_T)
{
Some(PathBuf::from(tmpdir))
Expand All @@ -140,13 +141,7 @@ impl Options {
} else if matches.get_flag(OPT_T) || matches.contains_id(OPT_TMPDIR) {
// If --tmpdir is given without an argument, or -t is given
// export in TMPDIR
#[cfg(target_os = "wasi")]
// WASI's `std::env::temp_dir()` unconditionally panics
let default_tmp_dir = env::var_os(TMPDIR_ENV_VAR)
.map_or_else(|| PathBuf::from(FALLBACK_TMPDIR), PathBuf::from);
#[cfg(not(target_os = "wasi"))]
let default_tmp_dir = env::temp_dir();
Some(default_tmp_dir)
Some(get_tmpdir_env_or_default())
} else {
None
};
Expand Down
25 changes: 25 additions & 0 deletions tests/by-util/test_mktemp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,31 @@ fn test_empty_tmpdir_env_var() {
}
}

#[test]
#[cfg(not(any(windows, target_os = "android")))]
#[cfg_attr(wasi_runner, ignore = "WASI sandbox: host paths not visible")]
fn test_empty_tmpdir_env_var_with_template() {
for args in [
&["-t", "fooXXX"][..],
&["-d", "-t", "fooXXX"],
&["--tmpdir", "fooXXX"],
] {
let result = new_ucmd!().env(TMPDIR, "").args(args).succeeds();
let path = result.stdout_str().trim_end();
assert!(path.starts_with("/tmp/foo"), "{args:?}: {path}");
}

let (at, mut ucmd) = at_and_ucmd!();
at.mkdir("d");
let dir = at.plus_as_string("d");
let result = ucmd
.env(TMPDIR, "")
.args(&["-p", &dir, "-t", "fooXXX"])
.succeeds();
let path = result.stdout_str().trim_end();
assert!(path.starts_with(&format!("{dir}/foo")), "{path}");
}

#[test]
fn test_nonexistent_dir_prefix() {
#[cfg(not(windows))]
Expand Down
Loading