lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor refactor, plus cutting out a potential bug of setting dir_on[] to -1.

This commit is contained in:
toasterbabe 2017-05-24 20:55:35 +01:00
parent e41976fb05
commit 74c4ad4bad
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/filesrch.c
View File

@ -560,15 +560,13 @@ boolean preparefilemenu(boolean samedepth)
else else
menusearch[0] = menusearch[1] = 0; // clear search menusearch[0] = menusearch[1] = 0; // clear search
for (; sizedirmenu > 0; sizedirmenu--) for (; sizedirmenu > 0; sizedirmenu--) // clear out existing items
{ {
Z_Free(dirmenu[sizedirmenu-1]); Z_Free(dirmenu[sizedirmenu-1]);
dirmenu[sizedirmenu-1] = NULL; dirmenu[sizedirmenu-1] = NULL;
} }
dirhandle = opendir(menupath); if (!(dirhandle = opendir(menupath))) // get directory
if (dirhandle == NULL)
return false; return false;
if (menusearch[0]) if (menusearch[0])
@ -604,7 +602,7 @@ boolean preparefilemenu(boolean samedepth)
size_t len = strlen(dent->d_name)+1; size_t len = strlen(dent->d_name)+1;
UINT8 ext; UINT8 ext;
for (ext = 0; ext < NUM_EXT_TABLE; ext++) for (ext = 0; ext < NUM_EXT_TABLE; ext++)
if (!strcasecmp(exttable[ext], dent->d_name+len-5)) break; if (!strcasecmp(exttable[ext], dent->d_name+len-5)) break; // extension comparison
if (ext == NUM_EXT_TABLE) continue; // not an addfile-able (or exec-able) file if (ext == NUM_EXT_TABLE) continue; // not an addfile-able (or exec-able) file
} }
searchdir; searchdir;
@ -671,7 +669,7 @@ boolean preparefilemenu(boolean samedepth)
{ {
if (!((numfolders+pos) < sizedirmenu)) continue; // crash prevention if (!((numfolders+pos) < sizedirmenu)) continue; // crash prevention
for (; ext < NUM_EXT_TABLE; ext++) for (; ext < NUM_EXT_TABLE; ext++)
if (!strcasecmp(exttable[ext], dent->d_name+len-5)) break; if (!strcasecmp(exttable[ext], dent->d_name+len-5)) break; // extension comparison
if (ext == NUM_EXT_TABLE && !cv_addons_showall.value) continue; // not an addfile-able (or exec-able) file if (ext == NUM_EXT_TABLE && !cv_addons_showall.value) continue; // not an addfile-able (or exec-able) file
ext += EXT_START; // moving to be appropriate position ext += EXT_START; // moving to be appropriate position
@ -732,6 +730,8 @@ boolean preparefilemenu(boolean samedepth)
} }
} }
closedir(dirhandle);
if (noresults) // no results if (noresults) // no results
dirmenu[0] = Z_StrDup(va("%c\13No results...", EXT_NORESULTS)); dirmenu[0] = Z_StrDup(va("%c\13No results...", EXT_NORESULTS));
else if (!menusearch[0] &&menudepthleft != menudepth-1) // now for UP... entry else if (!menusearch[0] &&menudepthleft != menudepth-1) // now for UP... entry
@ -754,16 +754,14 @@ boolean preparefilemenu(boolean samedepth)
Z_Free(tempname); Z_Free(tempname);
} }
if (dir_on[menudepthleft] >= sizedirmenu)
dir_on[menudepthleft] = sizedirmenu-1;
closedir(dirhandle);
if (!sizedirmenu) if (!sizedirmenu)
{ {
dir_on[menudepthleft] = 0;
Z_Free(dirmenu); Z_Free(dirmenu);
return false; return false;
} }
else if (dir_on[menudepthleft] >= sizedirmenu)
dir_on[menudepthleft] = sizedirmenu-1;
return true; return true;
} }