Skip to content

install: fixes issue #7795 #7838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

install: fixes issue #7795 #7838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/uu/install/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ enum InstallError {

#[error("cannot overwrite directory {} with non-directory {}", .0.quote(), .1.quote())]
OverrideDirectoryFailed(PathBuf, PathBuf),

#[error("'{0}' and '{1}' are the same file")]
SameFile(PathBuf, PathBuf),
}

impl UError for InstallError {
Expand Down Expand Up @@ -751,6 +754,12 @@ fn copy_normal_file(from: &Path, to: &Path) -> UResult<()> {
/// Returns an empty Result or an error in case of failure.
///
fn copy_file(from: &Path, to: &Path) -> UResult<()> {
if let Ok(to_abs) = to.canonicalize() {
if from.canonicalize()? == to_abs {
return Err(InstallError::SameFile(from.to_path_buf(), to.to_path_buf()).into());
}
}

if to.is_dir() && !from.is_dir() {
return Err(InstallError::OverrideDirectoryFailed(
to.to_path_buf().clone(),
Expand Down
30 changes: 30 additions & 0 deletions tests/by-util/test_install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,3 +1778,33 @@ fn test_install_failing_copy_file_to_target_contain_subdir_with_same_name() {
.fails()
.stderr_contains("cannot overwrite directory");
}

#[test]
fn test_install_same_file() {
let (at, mut ucmd) = at_and_ucmd!();
let file = "file";

at.touch(file);
ucmd.arg(file)
.arg(".")
.fails()
.stderr_contains("'file' and './file' are the same file");
}

#[test]
fn test_install_symlink_same_file() {
let (at, mut ucmd) = at_and_ucmd!();
let file = "file";
let target_dir = "target_dir";
let target_link = "target_link";

at.mkdir(target_dir);
at.touch(format!("{target_dir}/{file}"));
at.symlink_file(target_dir, target_link);
ucmd.arg(format!("{target_dir}/{file}"))
.arg(target_link)
.fails()
.stderr_contains(format!(
"'{target_dir}/{file}' and '{target_link}/{file}' are the same file"
));
}
Loading