From: Alan Modra <amodra@gmail.com>
Date: Wed, 14 Apr 2021 16:03:13 +0000 (+0930)
Subject: Make objcopy -p work when an output file is specified
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4454ee18960b092ba10e43100d43fef12f65b26;p=thirdparty%2Fbinutils-gdb.git

Make objcopy -p work when an output file is specified

More fallout from the PR27456 fixes.

	PR 27456
	* rename.c (smart_rename): When TO and FROM are equal, just set
	file timestamp.
	* objcopy.c (strip_main, copy_main): Always call smart_rename.

(cherry picked from commit d0ecdcddc363ad7f05fc50cf1eee4028fa7f8964)
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 57ee4bc8ab2..11ff778cc35 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-15  Alan Modra  <amodra@gmail.com>
+
+	PR 27456
+	* rename.c (smart_rename): When TO and FROM are equal, just set
+	file timestamp.
+	* objcopy.c (strip_main, copy_main): Always call smart_rename.
+
 2021-02-26  Alan Modra  <amodra@gmail.com>
 
 	Backport from mainline
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 620baee6dec..00ef851dc5d 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -4865,10 +4865,9 @@ strip_main (int argc, char *argv[])
 		 output_target, NULL);
       if (status == 0)
 	{
-	  if (output_file != tmpname)
-	    status = smart_rename (tmpname,
-				   output_file ? output_file : argv[i],
-				   copyfd, &statbuf, preserve_dates) != 0;
+	  const char *oname = output_file ? output_file : argv[i];
+	  status = smart_rename (tmpname, oname, copyfd,
+				 &statbuf, preserve_dates) != 0;
 	  if (status == 0)
 	    status = hold_status;
 	}
@@ -5944,9 +5943,9 @@ copy_main (int argc, char *argv[])
 	     output_target, input_arch);
   if (status == 0)
     {
-      if (tmpname != output_filename)
-	status = smart_rename (tmpname, input_filename, copyfd,
-			       &statbuf, preserve_dates) != 0;
+      const char *oname = output_filename ? output_filename : input_filename;
+      status = smart_rename (tmpname, oname, copyfd,
+			     &statbuf, preserve_dates) != 0;
     }
   else
     {
diff --git a/binutils/rename.c b/binutils/rename.c
index 861c2b56d18..0427348df5b 100644
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -129,16 +129,19 @@ int
 smart_rename (const char *from, const char *to, int fromfd,
 	      struct stat *target_stat, bfd_boolean preserve_dates)
 {
-  int ret;
+  int ret = 0;
 
-  ret = simple_copy (fromfd, to, target_stat);
-  if (ret != 0)
-    non_fatal (_("unable to copy file '%s'; reason: %s"),
-	       to, strerror (errno));
+  if (to != from)
+    {
+      ret = simple_copy (fromfd, to, target_stat);
+      if (ret != 0)
+	non_fatal (_("unable to copy file '%s'; reason: %s"),
+		   to, strerror (errno));
+      unlink (from);
+    }
 
   if (preserve_dates)
     set_times (to, target_stat);
-  unlink (from);
 
   return ret;
 }