From: Jim Meyering <jim@meyering.net>
Date: Sun, 8 Sep 1996 17:55:24 +0000 (+0000)
Subject: (do_copy): Set backup_type to `none' only *after*
X-Git-Tag: TEXTUTILS-1_19f~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4526777121ad2a7b442c9ad3881062efe9853f40;p=thirdparty%2Fcoreutils.git

(do_copy): Set backup_type to `none' only *after*
calling to find_backup_file_name.  Reported by Eli Zaretskii.
---

diff --git a/src/cp.c b/src/cp.c
index 98894a3dd4..74b7c2d961 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -507,8 +507,13 @@ do_copy (int argc, char **argv)
 	  && STREQ (source, dest)
 	  && !new_dst && S_ISREG (sb.st_mode))
 	{
-	  backup_type = none;
 	  new_dest = find_backup_file_name (dest);
+	  /* Set backup_type to `none' so that the normal backup
+	     mechanism is not used when performing the actual copy.
+	     backup_type must be set to `none' only *after* the above
+	     call to find_backup_file_name -- that function uses
+	     backup_type to determine the suffix it applies.  */
+	  backup_type = none;
 	  if (new_dest == NULL)
 	    error (1, 0, _("virtual memory exhausted"));
 	}