zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

cache1d: add FIND_NOCURDIR option to klistpath().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4188 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-12-01 18:27:59 +00:00
parent a783933726
commit 2a43511c70
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/build/include/cache1d.h
View file

@ -44,6 +44,7 @@ enum {
CACHE1D_FIND_FILE = 1,
CACHE1D_FIND_DIR = 2,
CACHE1D_FIND_DRIVE = 4,
CACHE1D_FIND_NOCURDIR = 8,
CACHE1D_OPT_NOSTACK = 0x100,

20
polymer/eduke32/build/src/cache1d.c
View file

@ -1198,15 +1198,18 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type)
searchpath_t *search = NULL;
BDIR *dir;
struct Bdirent *dirent;
static const char *const CUR_DIR = "./";
// Adjusted for the following "autoload" dir fix - NY00123
const char *d = "./";
const char *d = pathsearchmode ? _path : CUR_DIR;
int32_t stackdepth = CACHE1D_SOURCE_CURDIR;
char buf[BMAX_PATH];
if (pathsearchmode) d = _path;
do
{
if (d==CUR_DIR && (type & CACHE1D_FIND_NOCURDIR))
goto next;
strcpy(buf, d);
if (!pathsearchmode)
{
@ -1239,8 +1242,9 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type)
}
Bclosedir(dir);
}
if (pathsearchmode) break;
next:
if (pathsearchmode)
break;
if (!search)
{
@ -1252,12 +1256,15 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type)
search = search->next;
stackdepth++;
}
if (search) d = search->path;
if (search)
d = search->path;
}
while (search);
}
#ifdef WITHKPLIB
if (!(type & CACHE1D_FIND_NOCURDIR)) // TEMP, until we have sorted out fs.listpath() API
if (!pathsearchmode) // next, zip files
{
char buf[BMAX_PATH+4];
@ -1329,6 +1336,7 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type)
}
#endif
// then, grp files
if (!(type & CACHE1D_FIND_NOCURDIR)) // TEMP, until we have sorted out fs.listpath() API
if (!pathsearchmode && !*path && (type & CACHE1D_FIND_FILE))
{
char buf[13];