mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ticket #1907 (append filename to path copy/move operation) 

append filename to path into copy/move dialog, "to:" input field

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
This commit is contained in:
nikk 2010-05-30 20:18:43 +03:00 committed by Ilia Maslakov
parent 5e35fb66c7
commit 9b5a8dec33
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/file.c
View File

@ -2068,21 +2068,28 @@ 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' && dest_dir[strlen (dest_dir) - 1] != PATH_SEP)
{
/* add trailing separator */
dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL);
}
else
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
{
/* add trailing separator */
dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL);
}
if (dest_dir_ == NULL)
{
file_op_total_context_destroy (tctx);