2024-01-31 10:51:19 +00:00
|
|
|
Index: mc-4.8.31/src/filemanager/file.c
|
2019-01-16 01:08:34 +00:00
|
|
|
===================================================================
|
2024-01-31 10:51:19 +00:00
|
|
|
--- mc-4.8.31.orig/src/filemanager/file.c
|
|
|
|
+++ mc-4.8.31/src/filemanager/file.c
|
|
|
|
@@ -2744,6 +2744,8 @@ copy_file_file (file_op_total_context_t
|
2014-03-16 04:07:49 +00:00
|
|
|
continue;
|
|
|
|
if (temp_status == FILE_ABORT)
|
|
|
|
return_status = temp_status;
|
|
|
|
+ if (temp_status == FILE_SKIP)
|
|
|
|
+ return_status = temp_status;
|
|
|
|
if (temp_status == FILE_SKIPALL)
|
|
|
|
ctx->skip_all = TRUE;
|
|
|
|
break;
|
2024-01-31 10:51:19 +00:00
|
|
|
@@ -2754,6 +2756,8 @@ copy_file_file (file_op_total_context_t
|
2019-01-16 01:08:34 +00:00
|
|
|
temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path);
|
2014-03-16 04:07:49 +00:00
|
|
|
if (temp_status == FILE_RETRY)
|
|
|
|
continue;
|
|
|
|
+ if (temp_status == FILE_SKIP)
|
|
|
|
+ return_status = temp_status;
|
|
|
|
if (temp_status == FILE_SKIPALL)
|
|
|
|
ctx->skip_all = TRUE;
|
|
|
|
return_status = temp_status;
|
2024-01-31 10:51:19 +00:00
|
|
|
@@ -2785,10 +2789,10 @@ copy_file_file (file_op_total_context_t
|
2021-03-19 09:14:05 +00:00
|
|
|
if (temp_status == FILE_SKIPALL)
|
|
|
|
{
|
|
|
|
ctx->skip_all = TRUE;
|
|
|
|
- return_status = FILE_CONT;
|
|
|
|
+ return_status = FILE_SKIPALL;
|
2014-03-16 04:07:49 +00:00
|
|
|
}
|
2021-03-19 09:14:05 +00:00
|
|
|
if (temp_status == FILE_SKIP)
|
|
|
|
- return_status = FILE_CONT;
|
|
|
|
+ return_status = FILE_SKIP;
|
|
|
|
break;
|
2014-03-16 04:07:49 +00:00
|
|
|
}
|
2021-03-19 09:14:05 +00:00
|
|
|
|
2024-01-31 10:51:19 +00:00
|
|
|
@@ -2801,10 +2805,10 @@ copy_file_file (file_op_total_context_t
|
2021-03-19 09:14:05 +00:00
|
|
|
if (temp_status == FILE_SKIPALL)
|
|
|
|
{
|
|
|
|
ctx->skip_all = TRUE;
|
|
|
|
- return_status = FILE_CONT;
|
|
|
|
+ return_status = FILE_SKIPALL;
|
2014-03-16 04:07:49 +00:00
|
|
|
}
|
2021-03-19 09:14:05 +00:00
|
|
|
if (temp_status == FILE_SKIP)
|
|
|
|
- return_status = FILE_CONT;
|
|
|
|
+ return_status = FILE_SKIP;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|