From 7ffe3d49efab4e0ca9cd7fdeb49319637cd857b8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 16 Nov 2024 23:15:21 +0100
Subject: [PATCH] mv: fix the output of an error message + adjust a GNU test

Should make tests/mv/dup-source.sh pass
---
 src/uu/mv/src/mv.rs                     |  2 +-
 tests/by-util/test_mv.rs                | 20 ++++++++++++++++++++
 util/gnu-patches/tests_dup_source.patch | 13 +++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 util/gnu-patches/tests_dup_source.patch

diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs
index c57f2527e..9d8452b1e 100644
--- a/src/uu/mv/src/mv.rs
+++ b/src/uu/mv/src/mv.rs
@@ -488,7 +488,7 @@ fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, options: &Options)
                     format!(
                         "cannot move '{}' to a subdirectory of itself, '{}/{}'",
                         sourcepath.display(),
-                        target_dir.display(),
+                        uucore::fs::normalize_path(target_dir).display(),
                         canonicalized_target_dir.components().last().map_or_else(
                             || target_dir.display().to_string(),
                             |dir| { PathBuf::from(dir.as_os_str()).display().to_string() }
diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs
index d8bc49e8e..6f2693a86 100644
--- a/tests/by-util/test_mv.rs
+++ b/tests/by-util/test_mv.rs
@@ -1732,3 +1732,23 @@ fn test_mv_error_msg_with_multiple_sources_that_does_not_exist() {
         .stderr_contains("mv: cannot stat 'a': No such file or directory")
         .stderr_contains("mv: cannot stat 'b/': No such file or directory");
 }
+
+#[test]
+fn test_mv_error_cant_move_itself() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+    at.mkdir("b");
+    scene
+        .ucmd()
+        .arg("b")
+        .arg("b/")
+        .fails()
+        .stderr_contains("mv: cannot move 'b' to a subdirectory of itself, 'b/b'");
+    scene
+        .ucmd()
+        .arg("./b")
+        .arg("b")
+        .arg("b/")
+        .fails()
+        .stderr_contains("mv: cannot move 'b' to a subdirectory of itself, 'b/b'");
+}
diff --git a/util/gnu-patches/tests_dup_source.patch b/util/gnu-patches/tests_dup_source.patch
new file mode 100644
index 000000000..44e33723b
--- /dev/null
+++ b/util/gnu-patches/tests_dup_source.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/mv/dup-source.sh b/tests/mv/dup-source.sh
+index 7bcd82fc3..0f9005296 100755
+--- a/tests/mv/dup-source.sh
++++ b/tests/mv/dup-source.sh
+@@ -83,7 +83,7 @@ $i: cannot stat 'a': No such file or directory
+ $i: cannot stat 'a': No such file or directory
+ $i: cannot stat 'b': No such file or directory
+ $i: cannot move './b' to a subdirectory of itself, 'b/b'
+-$i: warning: source directory 'b' specified more than once
++$i: cannot move 'b' to a subdirectory of itself, 'b/b'
+ EOF
+   compare exp out || fail=1
+ done