From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 12 Jan 2022 21:52:23 +0000 (-0800)
Subject: cp: tweak internal name
X-Git-Tag: v9.1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f488e1d529286ba99e0ca5cf93a19ffae34b5fd;p=thirdparty%2Fcoreutils.git

cp: tweak internal name

* src/cp.c (do_copy): Omit confusingly-named local new_dest, since
there’s another var new_dst that means something quite different.
---

diff --git a/src/cp.c b/src/cp.c
index a3f2e59305..658851b43f 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -738,7 +738,6 @@ do_copy (int n_files, char **file, char const *target_directory,
     }
   else /* !target_directory */
     {
-      char const *new_dest;
       char const *source = file[0];
       char const *dest = file[1];
       bool unused;
@@ -763,7 +762,7 @@ do_copy (int n_files, char **file, char const *target_directory,
         {
           static struct cp_options x_tmp;
 
-          new_dest = find_backup_file_name (AT_FDCWD, dest, x->backup_type);
+          dest = find_backup_file_name (AT_FDCWD, dest, x->backup_type);
           /* Set x->backup_type to 'no_backups' so that the normal backup
              mechanism is not used when performing the actual copy.
              backup_type must be set to 'no_backups' only *after* the above
@@ -773,12 +772,8 @@ do_copy (int n_files, char **file, char const *target_directory,
           x_tmp.backup_type = no_backups;
           x = &x_tmp;
         }
-      else
-        {
-          new_dest = dest;
-        }
 
-      ok = copy (source, new_dest, 0, x, &unused, NULL);
+      ok = copy (source, dest, false, x, &unused, NULL);
     }
 
   return ok;