mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-04-01 04:33:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2276_cpmv_wrong_dest_dir'

Browse Source 
* 2276_cpmv_wrong_dest_dir:
  Ticket #2276: copy/move: wrong directory update with the same name
This commit is contained in:
Slava Zanko 2010-07-15 14:00:37 +03:00
commit cb85a8b87e
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/file.c
View File

@ -2066,28 +2066,21 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl
dest_dir = other_panel->cwd;
else
dest_dir = panel->cwd;
/*
* Add trailing backslash only when do non-local ops.
* It saves user from occasional file renames (when destination
* dir is deleted)
*/
if (force_single || dest_dir[0] == '\0')
{
/* just copy */
dest_dir_ = g_strdup (dest_dir);
}
else if (single_entry)
{
/* add filename to dest path */
dest_dir_ = g_build_filename (dest_dir, source, (char *) NULL);
}
else
if (!force_single && dest_dir[0] != '\0' && dest_dir[strlen (dest_dir) - 1] != PATH_SEP)
{
/* add trailing separator */
dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL);
}
else
{
/* just copy */
dest_dir_ = g_strdup (dest_dir);
}
if (dest_dir_ == NULL)
{
file_op_total_context_destroy (tctx);