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

Ticket #2366: ignore_dirs does not work while file searching.

Browse Source 
Refactoring: reimplement find_ignore_dirs as sorted array of strings.
Handling value of ignore_dirs like "/foo::/bar/:".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-11-03 15:28:03 +03:00
parent 6bdcd48b08
commit fdc443501a
1 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/find.c
View File

@ -88,7 +88,7 @@ typedef enum
} FindProgressStatus;
/* List of directories to be ignored, separated by ':' */
char *find_ignore_dirs = NULL;
char **find_ignore_dirs = NULL;
/* static variables to remember find parameters */
static WInput *in_start; /* Start path */
@ -190,6 +190,12 @@ static char *in_start_dir = INPUT_LAST_TEXT;
static mc_search_t *search_file_handle = NULL;
static mc_search_t *search_content_handle = NULL;
static int
find_ignore_dirs_cmp (const void *d1, const void *d2)
{
return strcmp (*(const char **) d1, *(const char **) d2);
}
static void
find_load_options (void)
{
@ -205,7 +211,7 @@ find_load_options (void)
ignore_dirs = mc_config_get_string (mc_main_config, "Misc", "find_ignore_dirs", "");
if (ignore_dirs[0] != '\0')
{
find_ignore_dirs = g_strconcat (":", ignore_dirs, ":", (char *) NULL);
find_ignore_dirs = g_strsplit (ignore_dirs, ":", -1);
mc_config_set_string (mc_main_config, "FindFile", "ignore_dirs", ignore_dirs);
}
g_free (ignore_dirs);
@ -215,11 +221,49 @@ find_load_options (void)
ignore_dirs = mc_config_get_string (mc_main_config, "FindFile", "ignore_dirs", "");
if (ignore_dirs[0] != '\0')
{
g_free (find_ignore_dirs);
find_ignore_dirs = g_strconcat (":", ignore_dirs, ":", (char *) NULL);
g_strfreev (find_ignore_dirs);
find_ignore_dirs = g_strsplit (ignore_dirs, ":", -1);
}
g_free (ignore_dirs);
if (find_ignore_dirs != NULL)
{
/* Values like '/foo::/bar: produce holes in list.
Find and remove them */
size_t r = 0, w = 0; /* read and write iterators */
for (; find_ignore_dirs[r] != NULL; r++)
{
if (find_ignore_dirs [r][0] == '\0')
{
/* empty entry -- skip it */
g_free (find_ignore_dirs [r]);
find_ignore_dirs [r] = NULL;
continue;
}
if (r != w)
{
/* copy entry to the previous free array cell */
find_ignore_dirs [w] = find_ignore_dirs [r];
find_ignore_dirs [r] = NULL;
}
canonicalize_pathname (find_ignore_dirs [w]);
w++;
}
/* sort array */
if (find_ignore_dirs[0] != NULL)
qsort (find_ignore_dirs, g_strv_length (find_ignore_dirs),
sizeof (find_ignore_dirs[0]), &find_ignore_dirs_cmp);
else
{
g_strfreev (find_ignore_dirs);
find_ignore_dirs = NULL;
}
}
options.file_case_sens =
mc_config_get_bool (mc_main_config, "FindFile", "file_case_sens", TRUE);
options.file_pattern =
@ -893,7 +937,6 @@ search_content (Dlg_head * h, const char *directory, const char *filename)
break;
}
}
}
}
tty_disable_interrupt_key ();
@ -901,6 +944,21 @@ search_content (Dlg_head * h, const char *directory, const char *filename)
return ret_val;
}
static inline gboolean
find_ignore_dir_search (const char *dir)
{
if (find_ignore_dirs != NULL)
{
char **ignore_dir;
for (ignore_dir = find_ignore_dirs; *ignore_dir != NULL; ignore_dir++)
if (strcmp (*ignore_dir, dir) == 0)
return TRUE;
}
return FALSE;
}
static int
do_search (struct Dlg_head *h)
{
@ -941,11 +999,9 @@ do_search (struct Dlg_head *h)
char *tmp = NULL;
tty_setcolor (REVERSE_COLOR);
while (TRUE)
{
char *temp_dir = NULL;
gboolean found;
tmp = pop_directory ();
if (tmp == NULL)
{
@ -955,14 +1011,7 @@ do_search (struct Dlg_head *h)
return 0;
}
if ((find_ignore_dirs == NULL) || (find_ignore_dirs[0] == '\0'))
break;
temp_dir = g_strdup_printf (":%s:", tmp);
found = strstr (find_ignore_dirs, temp_dir) != 0;
g_free (temp_dir);
if (!found)
if (!find_ignore_dir_search (tmp))
break;
g_free (tmp);