mktemp: prioritize TMPDIR over -p when using -t

uutils · May 19, 2023 · c0ea58a · c0ea58a
1 parent bf1bc17
commit c0ea58a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs
@@ -191,7 +191,9 @@ impl Options {
                     (tmpdir, template.to_string())
                 }
                 Some(template) => {
-                    let tmpdir = if matches.contains_id(OPT_TMPDIR) {
+                    let tmpdir = if env::var("TMPDIR").is_ok() && matches.get_flag(OPT_T) {
+                        env::var("TMPDIR").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

diff --git a/tests/by-util/test_mktemp.rs b/tests/by-util/test_mktemp.rs
@@ -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));
+}