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

Merge branch '3923_escape_fileop_filename' 

* 3923_escape_fileop_filename:
  (operate_one_file): remove unescape of source and destination filenames.
  Ticket #3923: fix of file name escaping in file operations.
This commit is contained in:
Andrew Borodin 2018-07-15 20:50:15 +03:00
parent 0075f36b69 f75430d68c
commit 6cdd3b7ad6
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/filemanager/file.c
View File

@ -277,10 +277,7 @@ build_dest (file_op_context_t * ctx, const char *src, const char *dest, FileProg
g_free (q);
q = strutils_shell_unescape (s);
g_free (s);
return q;
return s;
}
/* --------------------------------------------------------------------------------------------- */
@ -1912,19 +1909,12 @@ operate_single_file (const WPanel * panel, FileOperation operation, file_op_tota
temp = build_dest (ctx, src, dest, &value);
if (temp != NULL)
{
char *src2;
src2 = strutils_shell_unescape (src);
src = src2;
dest = temp;
switch (operation)
{
case OP_COPY:
/* we use file_mask_op_follow_links only with OP_COPY */
vfs_path_free (src_vpath);
src_vpath = vfs_path_from_str (src);
ctx->stat_func (src_vpath, src_stat);
value =
@ -1968,7 +1958,6 @@ operate_single_file (const WPanel * panel, FileOperation operation, file_op_tota
abort ();
}
g_free (src2);
g_free (temp);
}
}
@ -2011,19 +2000,12 @@ operate_one_file (const WPanel * panel, FileOperation operation, file_op_total_c
temp = build_dest (ctx, src, dest, &value);
if (temp != NULL)
{
char *src2;
src2 = strutils_shell_unescape (src);
src = src2;
dest = temp;
switch (operation)
{
case OP_COPY:
/* we use file_mask_op_follow_links only with OP_COPY */
vfs_path_free (src_vpath);
src_vpath = vfs_path_from_str (src);
ctx->stat_func (src_vpath, src_stat);
is_file = !S_ISDIR (src_stat->st_mode);
@ -2046,7 +2028,6 @@ operate_one_file (const WPanel * panel, FileOperation operation, file_op_total_c
abort ();
}
g_free (src2);
g_free (temp);
}
}