RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

mv: support the case mkdir a && mv a e/

Browse source
This commit is contained in:
Sylvestre Ledru 2024-01-03 23:43:02 +01:00
parent e341759dfe
commit 4c698d58e0
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/uu/mv/src/mv.rs
View file

@ -334,10 +334,11 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>
} }
} }
let target_is_dir = target.is_dir(); let target_is_dir: bool = target.is_dir();
let source_is_dir: bool = source.is_dir();
if path_ends_with_terminator(target) if path_ends_with_terminator(target)
&& !target_is_dir && (!target_is_dir && !source_is_dir)
&& !opts.no_target_dir && !opts.no_target_dir
&& opts.update != UpdateMode::ReplaceIfOlder && opts.update != UpdateMode::ReplaceIfOlder
{ {

13
tests/by-util/test_mv.rs
View file

@ -1556,6 +1556,19 @@ fn test_mv_dir_into_file_where_both_are_files() {
.stderr_contains("mv: cannot stat 'a/': Not a directory"); .stderr_contains("mv: cannot stat 'a/': Not a directory");
} }
#[test]
fn test_mv_dir_into_path_slash() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.mkdir("a");
scene.ucmd().arg("a").arg("e/").succeeds();
assert!(at.dir_exists("e"));
at.mkdir("b");
at.mkdir("f");
scene.ucmd().arg("b").arg("f/").succeeds();
assert!(at.dir_exists("f/b"));
}
// Todo: // Todo:
// $ at.touch a b // $ at.touch a b