From 3f488e1d529286ba99e0ca5cf93a19ffae34b5fd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 12 Jan 2022 13:52:23 -0800 Subject: [PATCH] cp: tweak internal name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * src/cp.c (do_copy): Omit confusingly-named local new_dest, since there’s another var new_dst that means something quite different. --- src/cp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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; -- 2.47.2