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

(move_dir_dir): refactoring: move erase of copied directories to separate function.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2017-08-02 13:34:19 +03:00
parent 93c6687cb7
commit 07bbfb73e3
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/filemanager/file.c
View File

@ -1248,6 +1248,38 @@ erase_dir_iff_empty (file_op_context_t * ctx, const vfs_path_t * vpath, size_t c
return try_erase_dir (ctx, s); return try_erase_dir (ctx, s);
} }
/* --------------------------------------------------------------------------------------------- */
static void
erase_dir_after_copy (file_op_total_context_t * tctx, file_op_context_t * ctx,
const vfs_path_t * vpath, FileProgressStatus * status)
{
if (ctx->erase_at_end)
{
/* Reset progress count before delete to avoid counting files twice */
tctx->progress_count = tctx->prev_progress_count;
while (erase_list != NULL && *status != FILE_ABORT)
{
struct link *lp = (struct link *) erase_list->data;
if (S_ISDIR (lp->st_mode))
*status = erase_dir_iff_empty (ctx, lp->src_vpath, tctx->progress_count);
else
*status = erase_file (tctx, ctx, lp->src_vpath);
erase_list = g_slist_remove (erase_list, lp);
free_link (lp);
}
/* Save progress counter before move next directory */
tctx->prev_progress_count = tctx->progress_count;
}
erase_dir_iff_empty (ctx, vpath, tctx->progress_count);
}
/* }}} */ /* }}} */
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -2749,28 +2781,8 @@ move_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
goto ret; goto ret;
mc_refresh (); mc_refresh ();
if (ctx->erase_at_end)
{
/* Reset progress count before delete to avoid counting files twice */
tctx->progress_count = tctx->prev_progress_count;
while (erase_list != NULL && return_status != FILE_ABORT) erase_dir_after_copy (tctx, ctx, src_vpath, &return_status);
{
struct link *lp = (struct link *) erase_list->data;
if (S_ISDIR (lp->st_mode))
return_status = erase_dir_iff_empty (ctx, lp->src_vpath, tctx->progress_count);
else
return_status = erase_file (tctx, ctx, lp->src_vpath);
erase_list = g_slist_remove (erase_list, lp);
free_link (lp);
}
/* Save progress counter before move next directory */
tctx->prev_progress_count = tctx->progress_count;
}
erase_dir_iff_empty (ctx, src_vpath, tctx->progress_count);
ret: ret:
erase_list = free_linklist (erase_list); erase_list = free_linklist (erase_list);