Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-13 14:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4878 from cakebaker/mktemp_4874

Browse source 
mktemp: prioritize TMPDIR over -p when using -t
This commit is contained in:
Sylvestre Ledru 2023-05-22 09:31:11 +02:00 committed by GitHub
commit e5419ade96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/uu/mktemp/src/mktemp.rs
View file

@ -42,6 +42,11 @@ static OPT_T: &str = "t";
static ARG_TEMPLATE: &str = "template";
#[cfg(not(windows))]
const TMPDIR_ENV_VAR: &str = "TMPDIR";
#[cfg(windows)]
const TMPDIR_ENV_VAR: &str = "TMP";
#[derive(Debug)]
enum MkTempError {
PersistError(PathBuf),
@ -191,7 +196,9 @@ impl Options {
(tmpdir, template.to_string())
}
Some(template) => {
let tmpdir = if matches.contains_id(OPT_TMPDIR) {
let tmpdir = if env::var(TMPDIR_ENV_VAR).is_ok() && matches.get_flag(OPT_T) {
env::var(TMPDIR_ENV_VAR).ok()
} else if matches.contains_id(OPT_TMPDIR) {
matches.get_one::<String>(OPT_TMPDIR).map(String::from)
} else if matches.get_flag(OPT_T) {
// mktemp -t foo.xxx should export in TMPDIR

17
tests/by-util/test_mktemp.rs
View file

@ -884,3 +884,20 @@ fn test_default_issue_4821_t_tmpdir_p() {
println!("stdout = {stdout}");
assert!(stdout.contains(&pathname));
}
#[test]
fn test_t_ensure_tmpdir_has_higher_priority_than_p() {
let scene = TestScenario::new(util_name!());
let pathname = scene.fixtures.as_string();
let result = scene
.ucmd()
.env(TMPDIR, &pathname)
.arg("-t")
.arg("-p")
.arg("should_not_attempt_to_write_in_this_nonexisting_dir")
.arg("foo.XXXX")
.succeeds();
let stdout = result.stdout_str();
println!("stdout = {stdout}");
assert!(stdout.contains(&pathname));
}