mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
cp: fix cp throwing error when dest is symlink and options backup and --rem is given
This commit is contained in:
parent
12eacd1cf2
commit
36237a2568
2 changed files with 51 additions and 32 deletions
|
@ -1669,12 +1669,11 @@ fn handle_existing_dest(
|
||||||
backup_dest(dest, &backup_path, is_dest_removed)?;
|
backup_dest(dest, &backup_path, is_dest_removed)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if !is_dest_removed {
|
||||||
match options.overwrite {
|
match options.overwrite {
|
||||||
// FIXME: print that the file was removed if --verbose is enabled
|
// FIXME: print that the file was removed if --verbose is enabled
|
||||||
OverwriteMode::Clobber(ClobberMode::Force) => {
|
OverwriteMode::Clobber(ClobberMode::Force) => {
|
||||||
if !is_dest_removed
|
if is_symlink_loop(dest) || fs::metadata(dest)?.permissions().readonly() {
|
||||||
&& (is_symlink_loop(dest) || fs::metadata(dest)?.permissions().readonly())
|
|
||||||
{
|
|
||||||
fs::remove_file(dest)?;
|
fs::remove_file(dest)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1705,14 +1704,13 @@ fn handle_existing_dest(
|
||||||
options.dereference(source_in_command_line),
|
options.dereference(source_in_command_line),
|
||||||
)
|
)
|
||||||
.context(format!("cannot stat {}", source.quote()))?,
|
.context(format!("cannot stat {}", source.quote()))?,
|
||||||
)
|
) {
|
||||||
&& !is_dest_removed
|
|
||||||
{
|
|
||||||
fs::remove_file(dest)?;
|
fs::remove_file(dest)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => (),
|
_ => (),
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -2044,6 +2042,7 @@ fn copy_file(
|
||||||
options.overwrite,
|
options.overwrite,
|
||||||
OverwriteMode::Clobber(ClobberMode::RemoveDestination)
|
OverwriteMode::Clobber(ClobberMode::RemoveDestination)
|
||||||
)
|
)
|
||||||
|
&& options.backup == BackupMode::NoBackup
|
||||||
{
|
{
|
||||||
fs::remove_file(dest)?;
|
fs::remove_file(dest)?;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5696,3 +5696,23 @@ fn test_cp_parents_absolute_path() {
|
||||||
let res = format!("dest{}/a/b/f", at.root_dir_resolved());
|
let res = format!("dest{}/a/b/f", at.root_dir_resolved());
|
||||||
at.file_exists(res);
|
at.file_exists(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// make sure that cp backup dest symlink before removing it.
|
||||||
|
#[test]
|
||||||
|
fn test_cp_with_options_backup_and_rem_when_dest_is_symlink() {
|
||||||
|
let scene = TestScenario::new(util_name!());
|
||||||
|
let at = &scene.fixtures;
|
||||||
|
at.write("file", "xyz");
|
||||||
|
at.mkdir("inner_dir");
|
||||||
|
at.write("inner_dir/inner_file", "abc");
|
||||||
|
at.relative_symlink_file("inner_file", "inner_dir/sl");
|
||||||
|
scene
|
||||||
|
.ucmd()
|
||||||
|
.args(&["-b", "--rem", "file", "inner_dir/sl"])
|
||||||
|
.succeeds();
|
||||||
|
assert!(at.file_exists("inner_dir/inner_file"));
|
||||||
|
assert_eq!(at.read("inner_dir/inner_file"), "abc");
|
||||||
|
assert!(at.symlink_exists("inner_dir/sl~"));
|
||||||
|
assert!(!at.symlink_exists("inner_dir/sl"));
|
||||||
|
assert_eq!(at.read("inner_dir/sl"), "xyz");
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue