From 73991edfcdd2e7587884fc8a597d8615faeb5388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 10 Nov 2008 16:01:37 +0000 Subject: [PATCH] * Removed marge artifacts as found by kaliber in ticket #3114, thanks! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28595 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/coreutils/src/copy.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/bin/coreutils/src/copy.c b/src/bin/coreutils/src/copy.c index 6cd7735e2e..3bb080c357 100644 --- a/src/bin/coreutils/src/copy.c +++ b/src/bin/coreutils/src/copy.c @@ -1490,19 +1490,14 @@ copy_internal (char const *src_name, char const *dst_name, quote_n (0, dst_name), quote_n (1, earlier_file)); goto un_backup; } - - if (link_failed) - { - error (0, errno, _("cannot create hard link %s to %s"), - quote_n (0, dst_name), quote_n (1, earlier_file)); - goto un_backup; - } - else - { - if (x->ignore_attributes == 0 - && copy_attributes_by_name(earlier_file, dst_name, false) != 0) - fprintf(stderr, "%s: could not copy attributes\n", earlier_file); - } + else + { + if (x->ignore_attributes == 0 + && copy_attributes_by_name (earlier_file, dst_name, + false) != 0) + error (0, errno, "cannot copy attributes from %s\n", + earlier_file); + } return true; }