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

Fix directory content counting before file operation.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-10-28 10:52:00 +04:00
parent dcfba47c8e
commit d0a082fbd5
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/filemanager/cmd.c
View File

@ -1636,6 +1636,7 @@ single_dirsize_cmd (void)
entry = &(panel->dir.list[panel->selected]);
if (S_ISDIR (entry->st.st_mode) && !DIR_IS_DOTDOT (entry->fname))
{
size_t dir_count = 0;
size_t count = 0;
uintmax_t total = 0;
ComputeDirSizeUI *ui;
@ -1644,7 +1645,8 @@ single_dirsize_cmd (void)
ui = compute_dir_size_create_ui (FALSE);
p = vfs_path_from_str (entry->fname);
if (compute_dir_size (p, ui, compute_dir_size_update_ui, &count, &total, TRUE) == FILE_CONT)
if (compute_dir_size (p, ui, compute_dir_size_update_ui, &dir_count, &count, &total, TRUE)
== FILE_CONT)
{
entry->st.st_size = (off_t) total;
entry->f.dir_size_computed = 1;
@ -1682,12 +1684,13 @@ dirsizes_cmd (void)
|| !panel->dirs_marked) && !DIR_IS_DOTDOT (panel->dir.list[i].fname))
{
vfs_path_t *p;
size_t dir_count = 0;
size_t count = 0;
uintmax_t total = 0;
gboolean ok;
p = vfs_path_from_str (panel->dir.list[i].fname);
ok = compute_dir_size (p, ui, compute_dir_size_update_ui, &count, &total,
ok = compute_dir_size (p, ui, compute_dir_size_update_ui, &dir_count, &count, &total,
TRUE) != FILE_CONT;
vfs_path_free (p);

30
src/filemanager/file.c
View File

@ -1239,6 +1239,8 @@ panel_compute_totals (const WPanel * panel, void *ui, compute_dir_size_callback
size_t * ret_count, uintmax_t * ret_total, gboolean compute_symlinks)
{
int i;
size_t lc_count = 0;
uintmax_t lc_total = 0;
for (i = 0; i < panel->dir.len; i++)
{
@ -1253,21 +1255,31 @@ panel_compute_totals (const WPanel * panel, void *ui, compute_dir_size_callback
{
vfs_path_t *p;
FileProgressStatus status;
size_t lc_dir_count = 0;
size_t lc_marked = 0;
uintmax_t lc_total2 = 0;
p = vfs_path_append_new (panel->cwd_vpath, panel->dir.list[i].fname, NULL);
status = compute_dir_size (p, ui, cback, ret_count, ret_total, compute_symlinks);
status = compute_dir_size (p, ui, cback, &lc_dir_count, &lc_marked, &lc_total2,
compute_symlinks);
vfs_path_free (p);
if (status != FILE_CONT)
return status;
lc_count += lc_marked;
lc_total += lc_total2;
}
else
{
(*ret_count)++;
*ret_total += (uintmax_t) s->st_size;
lc_count++;
lc_total += (uintmax_t) s->st_size;
}
}
*ret_count = lc_count;
*ret_total = lc_total;
return FILE_CONT;
}
@ -1301,9 +1313,10 @@ panel_operate_init_totals (const WPanel * panel, const char *source, file_op_con
else
{
vfs_path_t *p;
size_t dir_count = 0;
p = vfs_path_from_str (source);
status = compute_dir_size (p, ui, compute_dir_size_update_ui,
status = compute_dir_size (p, ui, compute_dir_size_update_ui, &dir_count,
&ctx->progress_count, &ctx->progress_bytes,
ctx->follow_links);
vfs_path_free (p);
@ -2568,12 +2581,11 @@ compute_dir_size_update_ui (void *ui, const vfs_path_t * dirname_vpath, size_t d
FileProgressStatus
compute_dir_size (const vfs_path_t * dirname_vpath, void *ui, compute_dir_size_callback cback,
size_t * ret_count, uintmax_t * ret_total, gboolean compute_symlinks)
size_t * ret_dir_count, size_t * ret_marked_count, uintmax_t * ret_total,
gboolean compute_symlinks)
{
size_t marked = 0;
return do_compute_dir_size (dirname_vpath, ui, cback, ret_count, &marked, ret_total,
compute_symlinks);
return do_compute_dir_size (dirname_vpath, ui, cback, ret_dir_count, ret_marked_count,
ret_total, compute_symlinks);
}
/* --------------------------------------------------------------------------------------------- */

4
src/filemanager/file.h
View File

@ -55,8 +55,8 @@ FileProgressStatus file_error (const char *format, const char *file);
/* return value is FILE_CONT or FILE_ABORT */
FileProgressStatus compute_dir_size (const vfs_path_t * dirname_vpath, void *ui,
compute_dir_size_callback cback,
size_t * ret_count, uintmax_t * ret_total,
gboolean compute_symlinks);
size_t * ret_dir_count, size_t * ret_marked_count,
uintmax_t * ret_total, gboolean compute_symlinks);
ComputeDirSizeUI *compute_dir_size_create_ui (gboolean allow_skip);
void compute_dir_size_destroy_ui (ComputeDirSizeUI * ui);