mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Tame the number of 'exec' and 'path' search_match wrappers. No functional

Browse Source 
change now, though more can likely go later, losing the (paritally complete or
incomplete/broken) argument completion bits.
This commit is contained in:
okan
2016-12-01 20:28:19 +00:00
parent b94f0748d8
commit 94f681fc90
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
search.c
View File

@@ -36,10 +36,8 @@
#define PATH_ANY 0x0001
#define PATH_EXEC 0x0002
static void search_match_path(struct menu_q *, struct menu_q *,
static void search_match_path_type(struct menu_q *, struct menu_q *,
char *, int);
static void search_match_path_exec(struct menu_q *, struct menu_q *,
char *);
static int strsubmatch(char *, char *, int);
void
@@ -141,7 +139,8 @@ search_print_client(struct menu *mi, int list)
}
static void
search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search, int flag)
search_match_path_type(struct menu_q *menuq, struct menu_q *resultq,
char *search, int flag)
{
char pattern[PATH_MAX];
glob_t g;
@@ -162,16 +161,10 @@ search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search, in
globfree(&g);
}
static void
search_match_path_exec(struct menu_q *menuq, struct menu_q *resultq, char *search)
{
return(search_match_path(menuq, resultq, search, PATH_EXEC));
}
void
search_match_path_any(struct menu_q *menuq, struct menu_q *resultq, char *search)
search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search)
{
return(search_match_path(menuq, resultq, search, PATH_ANY));
return(search_match_path_type(menuq, resultq, search, PATH_ANY));
}
void
@@ -208,14 +201,9 @@ search_match_exec(struct menu_q *menuq, struct menu_q *resultq, char *search)
if (mj == NULL)
TAILQ_INSERT_TAIL(resultq, mi, resultentry);
}
}
void
search_match_exec_path(struct menu_q *menuq, struct menu_q *resultq, char *search)
{
search_match_exec(menuq, resultq, search);
if (TAILQ_EMPTY(resultq))
search_match_path_exec(menuq, resultq, search);
search_match_path_type(menuq, resultq, search, PATH_EXEC);
}
static int