diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-09-17 18:50:08 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-09-19 11:25:23 +0100 |
| commit | 90aa291c39ca8970fbce310cc317c5cc7b392691 (patch) | |
| tree | 2613a601eb8ce9970ec2e4bb1bb564a8db3336f4 /src/copy.c | |
| parent | 8e93dc629727140e950a709008f9a17ca461af63 (diff) | |
| download | coreutils-90aa291c39ca8970fbce310cc317c5cc7b392691.tar.xz | |
cp: issue correct warning and ignore duplicate source dirs
* src/copy.c (copy_internal): Handle the case where we have the
same destination directory as already encountered, which can only
be due to the corresponding source directory being specified multiple
times.
* tests/cp/duplicate-sources.sh: Add a test for the new multiply
specified directory case, and the existing multiply specified file case.
* tests/local.mk: Reference the new test.
* NEWS: Mention the bug fix.
Diffstat (limited to 'src/copy.c')
| -rw-r--r-- | src/copy.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/copy.c b/src/copy.c index a9561c606..4e0d266b6 100644 --- a/src/copy.c +++ b/src/copy.c @@ -2187,6 +2187,17 @@ copy_internal (char const *src_name, char const *dst_name, *copy_into_self = true; goto un_backup; } + else if (same_name (dst_name, earlier_file)) + { + error (0, 0, _("warning: source directory %s " + "specified more than once"), + quote (top_level_src_name)); + /* We only do backups in move mode and for non dirs, + and in move mode this won't be the issue as the source will + be missing for subsequent attempts. + There we just warn and return here. */ + return true; + } else if (x->dereference == DEREF_ALWAYS) { /* This happens when e.g., encountering a directory for the |