From: Jim Meyering <jim@meyering.net>
Date: Sun, 23 May 1999 20:37:16 +0000 (+0000)
Subject: Remove today's earlier misguided attempts.
X-Git-Tag: FILEUTILS-4_0i~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=645015312e38b3d8a4692572077f48f34fe63a08;p=thirdparty%2Fcoreutils.git

Remove today's earlier misguided attempts.
Add a single condition to the existing sameness test.
---

diff --git a/src/copy.c b/src/copy.c
index 070c41983a..1a6694ebb8 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -461,7 +461,8 @@ copy_internal (const char *src_path, const char *dst_path,
 	      if (x->hard_link)
 		return 0;
 
-	      if (x->backup_type == none && !x->force)
+	      if (x->backup_type == none
+		  && (!x->force || same_name (src_path, dst_path)))
 		{
 		  error (0, 0, _("`%s' and `%s' are the same file"),
 			 src_path, dst_path);
@@ -569,15 +570,6 @@ copy_internal (const char *src_path, const char *dst_path,
 		}
 	      else
 		{
-		  if (SAME_INODE (src_sb, dst_sb)
-		      && (src_sb.st_nlink == 1
-			  || same_name (src_path, dst_path)))
-		    {
-		      error (0, 0, _("`%s' and `%s' are the same file"),
-			     src_path, dst_path);
-		      return 1;
-		    }
-
 		  if (unlink (dst_path) && errno != ENOENT)
 		    {
 		      error (0, errno, _("cannot remove old link to `%s'"),