D44805.diff
No OneTemporary
Actions

Size

697 B

Referenced Files

None

Subscribers

None

D44805.diff
View Options

	diff --git a/bin/cp/cp.c b/bin/cp/cp.c
	--- a/bin/cp/cp.c
	+++ b/bin/cp/cp.c
	@@ -452,13 +452,19 @@

	switch (curr->fts_statp->st_mode & S_IFMT) {
	case S_IFLNK:
	- /* Catch special case of a non-dangling symlink. */
	if ((fts_options & FTS_LOGICAL) \|\|
	((fts_options & FTS_COMFOLLOW) &&
	curr->fts_level == 0)) {
	+ /*
	+ * We asked FTS to follow links but got
	+ * here anyway, which means the target is
	+ * nonexistent or inaccessible. Let
	+ * copy_file() deal with the error.
	+ */
	if (copy_file(curr, dne))
	badcp = rval = 1;
	- } else {
	+ } else {
	+ /* Copy the link. */
	if (copy_link(curr, !dne))
	badcp = rval = 1;
	}