RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-07 07:38:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: pass extension lists as argument

Browse source
This commit is contained in:
notaz 2013-01-06 21:09:51 +02:00
parent 8a0998fb31
commit 4db02226eb
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
menu.c
View file

@ -922,8 +922,11 @@ static int scandir_cmp(const void *p1, const void *p2)
return alphasort(d1, d2); return alphasort(d1, d2);
} }
static const char **filter_exts_internal;
static int scandir_filter(const struct dirent *ent) static int scandir_filter(const struct dirent *ent)
{ {
const char **filter = filter_exts_internal;
const char *ext; const char *ext;
int i; int i;
@ -938,8 +941,8 @@ static int scandir_filter(const struct dirent *ent)
return 0; return 0;
ext++; ext++;
for (i = 0; i < array_size(filter_exts); i++) for (i = 0; filter[i] != NULL; i++)
if (strcasecmp(ext, filter_exts[i]) == 0) if (strcasecmp(ext, filter[i]) == 0)
return 1; return 1;
return 0; return 0;
@ -961,7 +964,8 @@ static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)
return i - 1; return i - 1;
} }
static char *menu_loop_romsel(char *curr_path, int len, static const char *menu_loop_romsel(char *curr_path, int len,
const char **filter_exts,
int (*extra_filter)(struct dirent **namelist, int count, int (*extra_filter)(struct dirent **namelist, int count,
const char *basedir)) const char *basedir))
{ {
@ -971,9 +975,10 @@ static char *menu_loop_romsel(char *curr_path, int len,
struct dirent **namelist = NULL; struct dirent **namelist = NULL;
int n = 0, inp = 0, sel = 0, show_help = 0; int n = 0, inp = 0, sel = 0, show_help = 0;
char *curr_path_restore = NULL; char *curr_path_restore = NULL;
char *ret = NULL; const char *ret = NULL;
char cinp; char cinp;
filter_exts_internal = filter_exts;
sel_fname[0] = 0; sel_fname[0] = 0;
// is this a dir or a full path? // is this a dir or a full path?
@ -985,6 +990,7 @@ static char *menu_loop_romsel(char *curr_path, int len,
curr_path_restore = p; curr_path_restore = p;
snprintf(sel_fname, sizeof(sel_fname), "%s", p + 1); snprintf(sel_fname, sizeof(sel_fname), "%s", p + 1);
if (rom_fname_reload[0] == 0)
show_help = 2; show_help = 2;
} }
@ -1096,7 +1102,7 @@ rescan:
strcat(newdir, "/"); strcat(newdir, "/");
strcat(newdir, namelist[sel+1]->d_name); strcat(newdir, namelist[sel+1]->d_name);
} }
ret = menu_loop_romsel(newdir, newlen, extra_filter); ret = menu_loop_romsel(newdir, newlen, filter_exts, extra_filter);
free(newdir); free(newdir);
break; break;
} }