diff options
Diffstat (limited to 'search.c')
| -rw-r--r-- | search.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/search.c b/search.c index e50884a..63ebdbd 100644 --- a/search.c +++ b/search.c @@ -148,11 +148,10 @@ static void search_match_path_type(struct menu_q *menuq, struct menu_q *resultq, char *search, int flag) { - char pattern[PATH_MAX]; - glob_t g; - int i; - - TAILQ_INIT(resultq); + struct menu *mi; + char pattern[PATH_MAX]; + glob_t g; + int i; (void)strlcpy(pattern, search, sizeof(pattern)); (void)strlcat(pattern, "*", sizeof(pattern)); @@ -162,7 +161,9 @@ search_match_path_type(struct menu_q *menuq, struct menu_q *resultq, for (i = 0; i < g.gl_pathc; i++) { if ((flag & PATH_EXEC) && access(g.gl_pathv[i], X_OK)) continue; - menuq_add(resultq, NULL, "%s", g.gl_pathv[i]); + mi = xcalloc(1, sizeof(*mi)); + (void)strlcpy(mi->text, g.gl_pathv[i], sizeof(mi->text)); + TAILQ_INSERT_TAIL(resultq, mi, resultentry); } globfree(&g); } @@ -170,7 +171,9 @@ search_match_path_type(struct menu_q *menuq, struct menu_q *resultq, void search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search) { - return(search_match_path_type(menuq, resultq, search, PATH_ANY)); + TAILQ_INIT(resultq); + + search_match_path_type(menuq, resultq, search, PATH_ANY); } void |