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

Ticket #3923: fix of file name escaping in file operations.

Browse Source 
Revert "(operate_single_file): make src and dest file name unescaping"

This reverts commit ef5d346dd9.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-06-30 11:33:01 +03:00
parent 0075f36b69
commit aea06fbc7a
1 changed files with 6 additions and 15 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); g_free (q);
q = strutils_shell_unescape (s); return s;
g_free (s);
return q;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -1912,19 +1909,12 @@ operate_single_file (const WPanel * panel, FileOperation operation, file_op_tota
temp = build_dest (ctx, src, dest, &value); temp = build_dest (ctx, src, dest, &value);
if (temp != NULL) if (temp != NULL)
{ {
char *src2;
src2 = strutils_shell_unescape (src);
src = src2;
dest = temp; dest = temp;
switch (operation) switch (operation)
{ {
case OP_COPY: case OP_COPY:
/* we use file_mask_op_follow_links only with 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); ctx->stat_func (src_vpath, src_stat);
value = value =
@ -1968,7 +1958,6 @@ operate_single_file (const WPanel * panel, FileOperation operation, file_op_tota
abort (); abort ();
} }
g_free (src2);
g_free (temp); g_free (temp);
} }
} }
@ -2011,12 +2000,14 @@ operate_one_file (const WPanel * panel, FileOperation operation, file_op_total_c
temp = build_dest (ctx, src, dest, &value); temp = build_dest (ctx, src, dest, &value);
if (temp != NULL) if (temp != NULL)
{ {
char *src2; char *src2, *temp2;
src2 = strutils_shell_unescape (src); src2 = strutils_shell_unescape (src);
temp2 = strutils_shell_unescape (temp);
g_free (temp);
src = src2; src = src2;
dest = temp; dest = temp2;
switch (operation) switch (operation)
{ {
@ -2047,7 +2038,7 @@ operate_one_file (const WPanel * panel, FileOperation operation, file_op_total_c
} }
g_free (src2); g_free (src2);
g_free (temp); g_free (temp2);
} }
} }