Repository navigation
cp: name both paths when a directory cannot overwrite a non-directory - #15170
Merged
Merged
Conversation
RenjiSann
reviewed
Oct 9, 2026
"cannot overwrite non-directory with directory" named neither path. A subdirectory whose destination already existed as a regular file was not caught at all: cp went on into it and failed later on the first file inside, with "cannot create regular file 'd/sub/x': Not a directory", and stopped there. A dangling symlink as the target of `cp -r` was followed, and its target created as a directory. Say which destination and which directory, as GNU does. Refuse a target that is not a directory before walking the tree, and for a subdirectory that would land on a file or a symlink, report it, leave the subtree alone and go on with the next entry, as GNU does.
Go through print_verbose_output like the file lines do, so that a closed or full stdout gives "write error" instead of a panic in println!.
The walk joins paths with a backslash on Windows.
NdekoCode
force-pushed
the
cp-overwrite-non-directory
branch
from
October 9, 2026 21:47
8abc8d7 to
0901725
Compare
Contributor
Author
|
Rebased on main (the --parents closure in copydir.rs), moved the directory -v line to print_verbose_output, and the new test builds the expected paths with path_concat! so it passes on Windows too. |
RenjiSann
approved these changes
Oct 10, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
cannot overwrite non-directory with directorynamed neither path, where GNU sayscannot overwrite non-directory 'dst' with directory 'src'. A subdirectory whose destination already existed as a regular file was not caught at all: cp went on into it and failed on the first file inside withcannot create regular file 'd/sub/x': Not a directory, then stopped. A dangling symlink given as the target ofcp -rwas followed, and its target created as a directory.The message now names the destination and the directory. A target that is not a directory (a file, or a symlink that does not lead to one) is refused before the tree is walked. A subdirectory that would land on a file or a symlink is reported, its subtree is left alone, and the copy goes on with the next entry, as GNU does; the exit status is 1. The
target_is_filefield ofEntryandContextonly served the first case and is gone.Checked against GNU 9.12 for
cp -r src dst,cp -rT src dst,cp -r src/. d, a subdirectory landing on a file, on a symlink to a directory, and a dangling symlink target. The cp test suite passes on macOS and Linux.Closes #15000.