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

Merge branch '4590_ext2attr_errno'

Browse Source 
* 4590_ext2attr_errno:
  (copy_dir_dir): clarify get of mode and attributes of source directory.
  file operations: rename actions and button names:
  Clarify messages of get/set ext2 attributes errors.
  Ticket #4590: clarify handling of ext2 attributes errors.
This commit is contained in:
Andrew Borodin 2024-10-18 20:11:07 +03:00
commit 8d0bb40f16
6 changed files with 209 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/man/mc.1.in
View File

@ -2571,9 +2571,15 @@ skipped.
There are three other dialogs which you can run into during the file
operations.
.PP
The error dialog informs about error conditions and has three choices.
Normally you select either the Skip button to skip the file or the Abort
button to abort the operation altogether. You can also select the Retry
The error dialog informs about error conditions and has four choices.
Normally you select either the
.I [Ignore]
button to ignore this error, or the
.I [Ignore all]
button to ignore this and all future errors, or the
.I [Abort]
button to abort the operation altogether. You can also select the
.I [Retry]
button if you fixed the problem from another terminal.
.PP
The replace dialog is shown when you attempt to copy or move a file on

13
doc/man/ru/mc.1.in
View File

@ -2925,14 +2925,15 @@ chattr \- команде изменения атрибутов файлов и
В процессе выполнения файловых операций вы можете увидеть окна ещё трёх
видов.
.PP
Окно ошибок информирует об ошибке и предлагает три варианта продолжения.
Окно ошибок информирует об ошибке и предлагает четыре варианта продолжения.
Обычно вы выбираете либо вариант
.B [Пропустить]
для того, чтобы исключить из обработки файл, на котором споткнулась
программа, либо
.B [Прервать] ,
.B [Игнорировать]
для того, чтобы пропустить ошибку файловой операции, либо
.B [Игнорировать всё]
для того, чтобы пропустить эту и все последующие ошибки файловой операции, либо
.BR [Прервать] ,
чтобы вообще отменить выполнение заданной операции. Третий вариант,
.B [Повторить] ,
.BR [Повторить] ,
выбирается тогда, когда вам удалось устранить причину сбоя (например,
воспользовавшись другим терминалом).
.PP

2
src/filemanager/chattr.c
View File

@ -1233,7 +1233,7 @@ chattr_cmd (WPanel *panel)
if (mc_fgetflags (vpath, &flags) != 0)
{
message (D_ERROR, MSG_ERROR, _("Cannot get flags of \"%s\"\n%s"), fname->str,
message (D_ERROR, MSG_ERROR, _("Cannot get ext2 attributes of \"%s\"\n%s"), fname->str,
unix_error_string (errno));
vfs_path_free (vpath, TRUE);
break;

360
src/filemanager/file.c
View File

@ -363,7 +363,7 @@ is_in_linklist (const GSList *lp, const vfs_path_t *vpath, const struct stat *sb
static hardlink_status_t
check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
const vfs_path_t *dst_vpath, gboolean *skip_all)
const vfs_path_t *dst_vpath, gboolean *ignore_all)
{
link_t *lnk;
ino_t ino = src_stat->st_ino;
@ -401,7 +401,7 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
{
gboolean ok;
while (!(ok = (mc_stat (lnk->dst_vpath, &link_stat) == 0)) && !*skip_all)
while (!(ok = (mc_stat (lnk->dst_vpath, &link_stat) == 0)) && !*ignore_all)
{
FileProgressStatus status;
@ -412,8 +412,8 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
return HARDLINK_ABORT;
if (status == FILE_RETRY)
continue;
if (status == FILE_SKIPALL)
*skip_all = TRUE;
if (status == FILE_IGNORE_ALL)
*ignore_all = TRUE;
break;
}
@ -421,7 +421,7 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
if (!ok)
return HARDLINK_ERROR;
while (!(ok = (mc_link (lnk->dst_vpath, dst_vpath) == 0)) && !*skip_all)
while (!(ok = (mc_link (lnk->dst_vpath, dst_vpath) == 0)) && !*ignore_all)
{
FileProgressStatus status;
@ -432,8 +432,8 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
return HARDLINK_ABORT;
if (status == FILE_RETRY)
continue;
if (status == FILE_SKIPALL)
*skip_all = TRUE;
if (status == FILE_IGNORE_ALL)
*ignore_all = TRUE;
break;
}
@ -443,7 +443,7 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
}
}
if (!*skip_all)
if (!*ignore_all)
{
FileProgressStatus status;
@ -468,8 +468,8 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat,
if (status == FILE_ABORT)
return HARDLINK_ABORT;
if (status == FILE_SKIPALL)
*skip_all = TRUE;
if (status == FILE_IGNORE_ALL)
*ignore_all = TRUE;
}
return HARDLINK_ERROR;
@ -521,13 +521,13 @@ make_symlink (file_op_context_t *ctx, const vfs_path_t *src_vpath, const vfs_pat
len = mc_readlink (src_vpath, link_target, sizeof (link_target) - 1);
if (len < 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot read source link \"%s\"\n%s"), src_path);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
goto retry_src_readlink;
}
@ -605,13 +605,13 @@ make_symlink (file_op_context_t *ctx, const vfs_path_t *src_vpath, const vfs_pat
goto ret;
}
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot create target symlink \"%s\"\n%s"), dst_path);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
goto retry_dst_symlink;
}
@ -941,20 +941,20 @@ real_do_file_error (enum OperationMode mode, gboolean allow_retry, const char *e
if (allow_retry)
result =
query_dialog (msg, error, D_ERROR, 4, _("&Skip"), _("Ski&p all"), _("&Retry"),
query_dialog (msg, error, D_ERROR, 4, _("&Ignore"), _("Ignore a&ll"), _("&Retry"),
_("&Abort"));
else
result = query_dialog (msg, error, D_ERROR, 3, _("&Skip"), _("Ski&p all"), _("&Abort"));
result = query_dialog (msg, error, D_ERROR, 3, _("&Ignore"), _("Ignore a&ll"), _("&Abort"));
switch (result)
{
case 0:
do_refresh ();
return FILE_SKIP;
return FILE_IGNORE;
case 1:
do_refresh ();
return FILE_SKIPALL;
return FILE_IGNORE_ALL;
case 2:
if (allow_retry)
@ -1182,13 +1182,13 @@ copy_file_file_display_progress (file_op_total_context_t *tctx, file_op_context_
static gboolean
try_remove_file (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgressStatus *status)
{
while (mc_unlink (vpath) != 0 && !ctx->skip_all)
while (mc_unlink (vpath) != 0 && !ctx->ignore_all)
{
*status = file_error (TRUE, _("Cannot remove file \"%s\"\n%s"), vfs_path_as_str (vpath));
if (*status == FILE_RETRY)
continue;
if (*status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (*status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
return FALSE;
}
@ -1238,13 +1238,13 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont
while (mc_lstat (src_vpath, &src_stat) != 0)
{
/* Source doesn't exist */
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot stat file \"%s\"\n%s"), s);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
if (return_status != FILE_RETRY)
@ -1309,13 +1309,13 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont
if (errno != EXDEV)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = files_error (_("Cannot move file \"%s\" to \"%s\"\n%s"), s, d);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
goto retry_rename;
}
@ -1420,11 +1420,11 @@ try_erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath)
dir = vfs_path_as_str (vpath);
while (my_rmdir (dir) != 0 && !ctx->skip_all)
while (my_rmdir (dir) != 0 && !ctx->ignore_all)
{
return_status = file_error (TRUE, _("Cannot remove directory \"%s\"\n%s"), dir);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status != FILE_RETRY)
break;
}
@ -1438,7 +1438,7 @@ try_erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath)
Recursive remove of files
abort->cancel stack
skip ->warn every level, gets default
skipall->remove as much as possible
ignore_all->remove as much as possible
*/
static FileProgressStatus
recursive_erase (file_op_total_context_t *tctx, file_op_context_t *ctx, const vfs_path_t *vpath)
@ -1659,16 +1659,16 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con
goto ret;
goto oktoret;
}
else if (ctx->skip_all)
return_status = FILE_SKIPALL;
else if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
if (S_ISDIR (dst_stat.st_mode))
return_status = file_error (TRUE, _("Cannot overwrite directory \"%s\"\n%s"), d);
else
return_status = file_error (TRUE, _("Cannot overwrite file \"%s\"\n%s"), d);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
goto retry_dst_stat;
}
@ -1685,11 +1685,11 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con
if (errno != EXDEV)
{
if (!ctx->skip_all)
if (!ctx->ignore_all)
{
return_status = files_error (_("Cannot move directory \"%s\" to \"%s\"\n%s"), s, d);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
goto retry_rename;
}
@ -2188,6 +2188,19 @@ end_bg_process (file_op_context_t *ctx, enum OperationMode mode)
#endif
/* }}} */
/* --------------------------------------------------------------------------------------------- */
/**
* On Solaris, ENOTSUP != EOPNOTSUPP. Some FS also return ENOSYS or EINVAL as "not implemented".
* On some Linux kernels (tested on 4.9, 5.4) there is ENOTTY on tmpfs.
*/
static inline gboolean
attrs_ignore_error (int e)
{
return (e == ENOTSUP || e == EOPNOTSUPP || e == ENOSYS || e == EINVAL || e == ENOTTY
|| e == ELOOP || e == ENXIO);
}
/* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
@ -2282,14 +2295,14 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
{
if (S_ISDIR (dst_stat.st_mode))
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status =
file_error (TRUE, _("Cannot overwrite directory \"%s\"\n%s"), dst_path);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
continue;
}
@ -2302,13 +2315,13 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
while ((*ctx->stat_func) (src_vpath, &src_stat) != 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot stat source file \"%s\"\n%s"), src_path);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
if (return_status != FILE_RETRY)
@ -2320,16 +2333,17 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
attrs_ok = FALSE;
/* don't show an error message if attributes aren't supported in this FS */
if (errno == ENOTSUP)
if (attrs_ignore_error (errno))
return_status = FILE_CONT;
else if (ctx->skip_all)
return_status = FILE_SKIPALL;
else if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status =
file_error (TRUE, _("Cannot get attributes of source file \"%s\"\n%s"), src_path);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
file_error (TRUE, _("Cannot get ext2 attributes of source file \"%s\"\n%s"),
src_path);
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_ABORT)
goto ret_fast;
}
@ -2364,7 +2378,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
/* Check the hardlinks */
if (!ctx->follow_links)
{
switch (check_hardlinks (src_vpath, &src_stat, dst_vpath, &ctx->skip_all))
switch (check_hardlinks (src_vpath, &src_stat, dst_vpath, &ctx->ignore_all))
{
case HARDLINK_OK:
/* We have made a hardlink - no more processing is necessary */
@ -2387,18 +2401,19 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
{
mc_utime (dst_vpath, &times);
while (attrs_ok && mc_fsetflags (dst_vpath, attrs) != 0 && !ctx->skip_all)
while (attrs_ok && mc_fsetflags (dst_vpath, attrs) != 0 && !ctx->ignore_all)
{
attrs_ok = FALSE;
/* don't show an error message if attributes aren't supported in this FS */
if (errno == ENOTSUP)
if (attrs_ignore_error (errno))
return_status = FILE_CONT;
else if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
else if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
else
return_status =
file_error (TRUE, _("Cannot set attributes of target file \"%s\"\n%s"),
file_error (TRUE,
_("Cannot set ext2 attributes of target file \"%s\"\n%s"),
dst_path);
if (return_status != FILE_RETRY)
@ -2421,26 +2436,27 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
#endif
while (mc_mknod (dst_vpath, src_stat.st_mode & ctx->umask_kill, rdev) < 0
&& !ctx->skip_all)
&& !ctx->ignore_all)
{
return_status =
file_error (TRUE, _("Cannot create special file \"%s\"\n%s"), dst_path);
if (return_status == FILE_RETRY)
continue;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
goto ret_fast;
}
/* Success */
while (ctx->preserve_uidgid
&& mc_chown (dst_vpath, src_stat.st_uid, src_stat.st_gid) != 0 && !ctx->skip_all)
&& mc_chown (dst_vpath, src_stat.st_uid, src_stat.st_gid) != 0
&& !ctx->ignore_all)
{
temp_status = file_error (TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path);
if (temp_status == FILE_SKIP)
if (temp_status == FILE_IGNORE)
break;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (temp_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (temp_status != FILE_RETRY)
{
return_status = temp_status;
@ -2449,13 +2465,13 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
}
while (ctx->preserve && mc_chmod (dst_vpath, src_stat.st_mode & ctx->umask_kill) != 0
&& !ctx->skip_all)
&& !ctx->ignore_all)
{
temp_status = file_error (TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path);
if (temp_status == FILE_SKIP)
if (temp_status == FILE_IGNORE)
break;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (temp_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (temp_status != FILE_RETRY)
{
return_status = temp_status;
@ -2463,21 +2479,21 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
}
}
while (attrs_ok && mc_fsetflags (dst_vpath, attrs) != 0 && !ctx->skip_all)
while (attrs_ok && mc_fsetflags (dst_vpath, attrs) != 0 && !ctx->ignore_all)
{
attrs_ok = FALSE;
/* don't show an error message if attributes aren't supported in this FS */
if (errno == ENOTSUP)
if (attrs_ignore_error (errno))
break;
temp_status =
file_error (TRUE, _("Cannot set attributes of target file \"%s\"\n%s"),
file_error (TRUE, _("Cannot set ext2 attributes of target file \"%s\"\n%s"),
dst_path);
if (temp_status == FILE_SKIP)
if (temp_status == FILE_IGNORE)
break;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (temp_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (temp_status != FILE_RETRY)
{
return_status = temp_status;
@ -2496,14 +2512,14 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
tv_transfer_start = g_get_monotonic_time ();
while ((src_desc = mc_open (src_vpath, O_RDONLY | O_LINEAR)) < 0 && !ctx->skip_all)
while ((src_desc = mc_open (src_vpath, O_RDONLY | O_LINEAR)) < 0 && !ctx->ignore_all)
{
return_status = file_error (TRUE, _("Cannot open source file \"%s\"\n%s"), src_path);
if (return_status == FILE_RETRY)
continue;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_SKIP)
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_IGNORE)
break;
ctx->do_append = FALSE;
goto ret_fast;
@ -2518,15 +2534,15 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
while (mc_fstat (src_desc, &src_stat) != 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot fstat source file \"%s\"\n%s"), src_path);
if (return_status == FILE_RETRY)
continue;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
ctx->do_append = FALSE;
}
goto ret;
@ -2549,16 +2565,16 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
{
if (errno != EEXIST)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status =
file_error (TRUE, _("Cannot create target file \"%s\"\n%s"), dst_path);
if (return_status == FILE_RETRY)
continue;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
ctx->do_append = FALSE;
}
}
@ -2582,15 +2598,15 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
/* Find out the optimal buffer size. */
while (mc_fstat (dest_desc, &dst_stat) != 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot fstat target file \"%s\"\n%s"), dst_path);
if (return_status == FILE_RETRY)
continue;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
goto ret;
}
@ -2599,7 +2615,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
while (mc_global.vfs.preallocate_space &&
vfs_preallocate (dest_desc, file_size, appending ? dst_stat.st_size : 0) != 0)
{
if (ctx->skip_all)
if (ctx->ignore_all)
{
/* cannot allocate, start the file copying anyway */
return_status = FILE_CONT;
@ -2609,10 +2625,10 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
return_status =
file_error (TRUE, _("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (ctx->skip_all || return_status == FILE_SKIP)
if (ctx->ignore_all || return_status == FILE_IGNORE)
{
/* skip the space allocation error, start file copying */
return_status = FILE_CONT;
@ -2663,14 +2679,14 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
/* src_read */
if (mc_ctl (src_desc, VFS_CTL_IS_NOTREADY, 0) == 0)
while ((n_read = mc_read (src_desc, buf, bufsize)) < 0 && !ctx->skip_all)
while ((n_read = mc_read (src_desc, buf, bufsize)) < 0 && !ctx->ignore_all)
{
return_status =
file_error (TRUE, _("Cannot read source file \"%s\"\n%s"), src_path);
if (return_status == FILE_RETRY)
continue;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
goto ret;
}
@ -2701,21 +2717,21 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
write_errno_nospace = (n_written < 0 && errno == ENOSPC);
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
return_status =
file_error (TRUE, _("Cannot write target file \"%s\"\n%s"), dst_path);
if (return_status == FILE_SKIP)
if (return_status == FILE_IGNORE)
{
if (write_errno_nospace)
goto ret;
break;
}
if (return_status == FILE_SKIPALL)
if (return_status == FILE_IGNORE_ALL)
{
ctx->skip_all = TRUE;
ctx->ignore_all = TRUE;
if (write_errno_nospace)
goto ret;
}
@ -2790,25 +2806,25 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
g_free (buf);
rotate_dash (FALSE);
while (src_desc != -1 && mc_close (src_desc) < 0 && !ctx->skip_all)
while (src_desc != -1 && mc_close (src_desc) < 0 && !ctx->ignore_all)
{
temp_status = file_error (TRUE, _("Cannot close source file \"%s\"\n%s"), src_path);
if (temp_status == FILE_RETRY)
continue;
if (temp_status == FILE_ABORT)
return_status = temp_status;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (temp_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
break;
}
while (dest_desc != -1 && mc_close (dest_desc) < 0 && !ctx->skip_all)
while (dest_desc != -1 && mc_close (dest_desc) < 0 && !ctx->ignore_all)
{
temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path);
if (temp_status == FILE_RETRY)
continue;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (temp_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
return_status = temp_status;
break;
}
@ -2830,7 +2846,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
/* Copy has succeeded */
while (ctx->preserve_uidgid && mc_chown (dst_vpath, src_uid, src_gid) != 0
&& !ctx->skip_all)
&& !ctx->ignore_all)
{
temp_status = file_error (TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path);
if (temp_status == FILE_ABORT)
@ -2840,18 +2856,18 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
}
if (temp_status == FILE_RETRY)
continue;
if (temp_status == FILE_SKIPALL)
if (temp_status == FILE_IGNORE_ALL)
{
ctx->skip_all = TRUE;
ctx->ignore_all = TRUE;
return_status = FILE_CONT;
}
if (temp_status == FILE_SKIP)
if (temp_status == FILE_IGNORE)
return_status = FILE_CONT;
break;
}
while (ctx->preserve && mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)) != 0
&& !ctx->skip_all)
&& !ctx->ignore_all)
{
temp_status = file_error (TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path);
if (temp_status == FILE_ABORT)
@ -2861,12 +2877,12 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
}
if (temp_status == FILE_RETRY)
continue;
if (temp_status == FILE_SKIPALL)
if (temp_status == FILE_IGNORE_ALL)
{
ctx->skip_all = TRUE;
ctx->ignore_all = TRUE;
return_status = FILE_CONT;
}
if (temp_status == FILE_SKIP)
if (temp_status == FILE_IGNORE)
return_status = FILE_CONT;
break;
}
@ -2885,19 +2901,20 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
/* Always sync timestamps */
mc_utime (dst_vpath, &times);
while (attrs_ok && mc_fsetflags (dst_vpath, attrs) != 0 && !ctx->skip_all)
while (attrs_ok && mc_fsetflags (dst_vpath, attrs) != 0 && !ctx->ignore_all)
{
attrs_ok = FALSE;
/* don't show an error message if attributes aren't supported in this FS */
if (errno == ENOTSUP)
if (attrs_ignore_error (errno))
{
return_status = FILE_CONT;
break;
}
temp_status = file_error (TRUE, _("Cannot set attributes for target file \"%s\"\n%s"),
dst_path);
temp_status =
file_error (TRUE, _("Cannot set ext2 attributes for target file \"%s\"\n%s"),
dst_path);
if (temp_status == FILE_ABORT)
return_status = FILE_ABORT;
if (temp_status == FILE_RETRY)
@ -2905,12 +2922,12 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
attrs_ok = TRUE;
continue;
}
if (temp_status == FILE_SKIPALL)
if (temp_status == FILE_IGNORE_ALL)
{
ctx->skip_all = TRUE;
ctx->ignore_all = TRUE;
return_status = FILE_CONT;
}
if (temp_status == FILE_SKIP)
if (temp_status == FILE_IGNORE)
return_status = FILE_CONT;
break;
}
@ -2953,19 +2970,19 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
/* First get the mode of the source dir */
retry_src_stat:
if ((*ctx->stat_func) (src_vpath, &src_stat) != 0)
while ((*ctx->stat_func) (src_vpath, &src_stat) != 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot stat source directory \"%s\"\n%s"), s);
if (return_status == FILE_RETRY)
goto retry_src_stat;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
goto ret_fast;
if (return_status != FILE_RETRY)
goto ret_fast;
}
while (attrs_ok && mc_fgetflags (src_vpath, &attrs) != 0)
@ -2973,27 +2990,26 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
attrs_ok = FALSE;
/* don't show an error message if attributes aren't supported in this FS */
if (errno == ENOTSUP)
{
if (attrs_ignore_error (errno))
return_status = FILE_CONT;
break;
}
if (ctx->skip_all)
return_status = FILE_SKIPALL;
else if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status =
file_error (TRUE, _("Cannot get attributes of source directory \"%s\"\n%s"), s);
if (return_status == FILE_RETRY)
{
attrs_ok = TRUE;
continue;
}
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
file_error (TRUE, _("Cannot get ext2 attributes of source directory \"%s\"\n%s"),
s);
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_ABORT)
goto ret_fast;
}
goto ret_fast;
if (return_status != FILE_RETRY)
break;
/* yet another attempt */
attrs_ok = TRUE;
}
if (is_in_linklist (dest_dirs, src_vpath, &src_stat) != NULL)
@ -3010,7 +3026,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
/* Check the hardlinks */
if (ctx->preserve)
{
switch (check_hardlinks (src_vpath, &src_stat, dst_vpath, &ctx->skip_all))
switch (check_hardlinks (src_vpath, &src_stat, dst_vpath, &ctx->ignore_all))
{
case HARDLINK_OK:
/* We have made a hardlink - no more processing is necessary */
@ -3027,15 +3043,15 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
if (!S_ISDIR (src_stat.st_mode))
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Source \"%s\" is not a directory\n%s"), s);
if (return_status == FILE_RETRY)
goto retry_src_stat;
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
goto ret_fast;
}
@ -3077,14 +3093,14 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
*/
if (!S_ISDIR (dst_stat.st_mode))
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status =
file_error (TRUE, _("Destination \"%s\" must be a directory\n%s"), d);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
if (return_status == FILE_RETRY)
goto retry_dst_stat;
}
@ -3110,14 +3126,14 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
{
while (my_mkdir (dst_vpath, (src_stat.st_mode & ctx->umask_kill) | S_IRWXU) != 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status =
file_error (TRUE, _("Cannot create target directory \"%s\"\n%s"), d);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
if (return_status != FILE_RETRY)
goto ret;
@ -3135,13 +3151,13 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
{
while (mc_chown (dst_vpath, src_stat.st_uid, src_stat.st_gid) != 0)
{
if (ctx->skip_all)
return_status = FILE_SKIPALL;
if (ctx->ignore_all)
return_status = FILE_IGNORE_ALL;
else
{
return_status = file_error (TRUE, _("Cannot chown target directory \"%s\"\n%s"), d);
if (return_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
if (return_status == FILE_IGNORE_ALL)
ctx->ignore_all = TRUE;
}
if (return_status != FILE_RETRY)
goto ret;
@ -3577,7 +3593,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl
if ((dst_result != 0) || S_ISDIR (dst_stat.st_mode))
break;
if (ctx->skip_all
if (ctx->ignore_all
|| file_error (TRUE, _("Destination \"%s\" must be a directory\n%s"),
dest) != FILE_RETRY)
goto clean_up;

2
src/filemanager/fileopctx.c
View File

@ -80,7 +80,7 @@ file_op_context_new (FileOperation op)
ctx->preserve_uidgid = (geteuid () == 0);
ctx->umask_kill = (mode_t) (~0);
ctx->erase_at_end = TRUE;
ctx->skip_all = FALSE;
ctx->ignore_all = FALSE;
return ctx;
}

5
src/filemanager/fileopctx.h
View File

@ -52,7 +52,8 @@ typedef enum
FILE_RETRY,
FILE_SKIP,
FILE_ABORT,
FILE_SKIPALL,
FILE_IGNORE,
FILE_IGNORE_ALL,
FILE_SUSPEND
} FileProgressStatus;
@ -146,7 +147,7 @@ typedef struct
pid_t pid;
/* toggle if all errors should be ignored */
gboolean skip_all;
gboolean ignore_all;
/* Whether the file operation is in pause */
gboolean suspended;