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

(dir_list_reload): refactoring.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-08-25 13:56:19 +03:00
parent ef2931272b
commit ef085af3ac
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/filemanager/dir.c
View File

@ -701,6 +701,7 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
int marked_cnt; int marked_cnt;
GHashTable *marked_files; GHashTable *marked_files;
const char *tmp_path; const char *tmp_path;
gboolean ret = TRUE;
if (list->callback != NULL) if (list->callback != NULL)
list->callback (DIR_OPEN, (void *) vpath); list->callback (DIR_OPEN, (void *) vpath);
@ -767,9 +768,8 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
} }
} }
while ((dp = mc_readdir (dirp)) != NULL) while (ret && (dp = mc_readdir (dirp)) != NULL)
{ {
file_entry_t *fentry;
gboolean link_to_dir, stale_link; gboolean link_to_dir, stale_link;
if (list->callback != NULL) if (list->callback != NULL)
@ -779,52 +779,37 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
continue; continue;
if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link))
ret = FALSE;
else
{ {
if (list->callback != NULL) file_entry_t *fentry;
list->callback (DIR_CLOSE, NULL);
mc_closedir (dirp);
/* Norbert (Feb 12, 1997):
Just in case someone finds this memory leak:
-1 means big trouble (at the moment no memory left),
I don't bother with further cleanup because if one gets to
this point he will have more problems than a few memory
leaks and because one 'dir_list_clean' would not be enough (and
because I don't want to spent the time to make it working,
IMHO it's not worthwhile).
dir_list_clean (&dir_copy);
*/
tree_store_end_check ();
g_hash_table_destroy (marked_files);
return FALSE;
}
fentry = &list->list[list->len - 1];
fentry->f.marked = 0; fentry = &list->list[list->len - 1];
/* /*
* If we have marked files in the copy, scan through the copy * If we have marked files in the copy, scan through the copy
* to find matching file. Decrease number of remaining marks if * to find matching file. Decrease number of remaining marks if
* we copied one. * we copied one.
*/ */
if (marked_cnt > 0 && g_hash_table_lookup (marked_files, dp->d_name) != NULL) fentry->f.marked = (marked_cnt > 0
{ && g_hash_table_lookup (marked_files, dp->d_name) != NULL);
fentry->f.marked = 1; if (fentry->f.marked)
marked_cnt--; marked_cnt--;
} }
} }
if (ret)
dir_list_sort (list, sort, sort_op);
if (list->callback != NULL) if (list->callback != NULL)
list->callback (DIR_CLOSE, NULL); list->callback (DIR_CLOSE, NULL);
mc_closedir (dirp); mc_closedir (dirp);
tree_store_end_check (); tree_store_end_check ();
g_hash_table_destroy (marked_files); g_hash_table_destroy (marked_files);
dir_list_sort (list, sort, sort_op);
dir_list_free_list (&dir_copy); dir_list_free_list (&dir_copy);
return TRUE; return ret;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */