Fix for #7455: cp -r <directory> -T <target> throws a StripPrefixError #7465
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Carreau
commented
Mar 16, 2025
| Some(root_path) | ||
| }; | ||
| let root_parent = | ||
| if (target.exists() || no_target_dir) && !root.to_str().unwrap().ends_with("/.") { |
There was a problem hiding this comment.
I'm not confident about this. The following also works.
Suggested change
| if (target.exists() || no_target_dir) && !root.to_str().unwrap().ends_with("/.") { | |
| if (target.exists() && !root.to_str().unwrap().ends_with("/.")) || no_target_dir { |
| } | ||
| descendant = descendant.strip_prefix(context.root)?.to_path_buf(); |
There was a problem hiding this comment.
And this is a bit a shot in the dark, I'm not sure I 100% get it.
|
GNU testsuite comparison: |
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue with the cp command when using the --no-target-dir flag and the target directory does not exist, and it adds a new test to validate trailing slash behavior to align with GNU cp.
- Re-enables a previously ignored test for the no-target-dir case.
- Adds a new test to ensure correct behavior when the target directory path has a trailing slash.
- Updates the Context::new function documentation and logic to support the no_target_dir flag.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| tests/by-util/test_cp.rs | Adds a new test to check cp behavior with a trailing slash on the target directory. |
| src/uu/cp/src/copydir.rs | Updates Context::new documentation and adjusts logic to correctly handle the no_target_dir flag. |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
|
gentle nudge |
sylvestre
reviewed
Apr 27, 2025
src/uu/cp/src/copydir.rs
Outdated
| /// - `root`: The source path from which the directory will be copied. | ||
| /// - `target`: The target path to which the directory will be copied. | ||
| /// - `no_target_dir`: A boolean indicating whether the root parent | ||
| /// should consider whether or not the target directory exists. |
There was a problem hiding this comment.
could you please fix this clippy warning? thanks
|
you have a few jobs failing |
This fixes the usage of the `--no-target-dir` then the target dir does not exists. This also adds a test when the target dir ends with a trailing slash, which is for me the expected behavior fo gnu cp, but i'd like someone else to confirm this. ``` $ mkdir temp $ touch temp/x ``` ``` $ rm -rf new_temp; ...gnubin/cp -r temp -T new_temp; tree new_temp; rm -rf new_temp; ...gnubin/cp -r temp -T new_temp/; tree new_temp; rm -rf new_temp; mkdir new_temp; ...gnubin/cp -r temp -T new_temp; tree new_temp; rm -rf new_temp; mkdir new_temp; ...gnubin/cp -r temp -T new_temp/; tree new_temp; new_temp └── x 1 directory, 1 file new_temp └── x 1 directory, 1 file new_temp └── x 1 directory, 1 file new_temp └── x ``` ``` $ rm -rf new_temp; target/debug/coreutils cp -r temp -T new_temp; tree new_temp; rm -rf new_temp; target/debug/coreutils cp -r temp -T new_temp/; tree new_temp; rm -rf new_temp; mkdir new_temp; target/debug/coreutils cp -r temp -T new_temp; tree new_temp; rm -rf new_temp; mkdir new_temp; target/debug/coreutils cp -r temp -T new_temp/; tree new_temp; $ rm -rf new_temp; target/debug/coreutils cp -r temp -T new_temp; tree new_temp; rm -rf new_temp; target/debug/coreutils cp -r temp -T new_temp/; tree new_temp; rm -rf new_temp; mkdir new_temp; target/debug/coreutils cp -r temp -T new_temp; tree new_temp; rm -rf new_temp; mkdir new_temp; target/debug/coreutils cp -r temp -T new_temp/; tree new_temp; new_temp └── x 1 directory, 1 file new_temp └── x 1 directory, 1 file new_temp └── x 1 directory, 1 file ```
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the usage of the
--no-target-dirthen the target dir does not exists.This also adds a test when the target dir ends with a trailing slash, which is for me the expected behavior fo gnu cp, but i'd like someone else to confirm this.