nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-23 04:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix to fs_cache/directory enumeration on windows

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1065 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-05-30 12:30:41 +00:00
parent 90725afe20
commit 57cac0ac70
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/client/sys_win.c
View file

@ -401,11 +401,11 @@ int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void
do do
{ {
if (*fd.cFileName == '.'); //don't ever find files with a name starting with '.' if (*fd.cFileName == '.'); //don't ever find files with a name starting with '.'
else if (fd.dwFileAttributes != 16) //is a directory else if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) //is a directory
{ {
if (wildcmp(match, fd.cFileName)) if (wildcmp(match, fd.cFileName))
{ {
sprintf(file, "%s%s", apath, fd.cFileName); sprintf(file, "%s%s/", apath, fd.cFileName);
go = func(file, fd.nFileSizeLow, parm); go = func(file, fd.nFileSizeLow, parm);
} }
} }
@ -413,7 +413,7 @@ int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void
{ {
if (wildcmp(match, fd.cFileName)) if (wildcmp(match, fd.cFileName))
{ {
sprintf(file, "%s%s/", apath, fd.cFileName); sprintf(file, "%s%s", apath, fd.cFileName);
go = func(file, fd.nFileSizeLow, parm); go = func(file, fd.nFileSizeLow, parm);
} }
} }

6
engine/http/iwebiface.c
View file

@ -99,14 +99,14 @@ void COM_EnumerateFiles (char *match, int (*func)(char *, int, void *), void *pa
do do
{ {
if (*fd.cFileName == '.'); if (*fd.cFileName == '.');
else if (fd.dwFileAttributes != 16) //is a directory else if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) //is a directory
{ {
sprintf(file, "%s%s", apath, fd.cFileName); sprintf(file, "%s%s/", apath, fd.cFileName);
go = func(file, fd.nFileSizeLow, parm); go = func(file, fd.nFileSizeLow, parm);
} }
else else
{ {
sprintf(file, "%s%s/", apath, fd.cFileName); sprintf(file, "%s%s", apath, fd.cFileName);
go = func(file, fd.nFileSizeLow, parm); go = func(file, fd.nFileSizeLow, parm);
} }
} }

12
engine/server/sv_sys_win.c
View file

@ -240,12 +240,7 @@ int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void
go = true; go = true;
do do
{ {
if (fd.dwFileAttributes != 16) //is a directory if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) //is a directory
{
sprintf(file, "%s%s", apath, fd.cFileName);
go = func(file, fd.nFileSizeLow, parm);
}
else
{ {
if (*fd.cFileName != '.') if (*fd.cFileName != '.')
{ {
@ -253,6 +248,11 @@ int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void
go = func(file, fd.nFileSizeLow, parm); go = func(file, fd.nFileSizeLow, parm);
} }
} }
else
{
sprintf(file, "%s%s", apath, fd.cFileName);
go = func(file, fd.nFileSizeLow, parm);
}
} }
while(FindNextFile(r, &fd) && go); while(FindNextFile(r, &fd) && go);
FindClose(r); FindClose(r);