TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use ntstring in file_getdirlist

Browse source
This commit is contained in:
Kp 2015-03-22 18:49:21 +00:00
parent 677e48bc7e
commit 383e7703b6
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/ui/file.cpp
View file

@ -42,28 +42,19 @@ static int file_sort_func(char **e0, char **e1)
char **file_getdirlist(int *NumDirs, const char *dir)
{
char path[PATH_MAX];
ntstring<PATH_MAX - 1> path;
auto dlen = path.copy_if(dir);
if (!dlen || !path.copy_if(dlen, "/"))
return nullptr;
++ dlen;
char **list = PHYSFS_enumerateFiles(dir);
char **i, **j = list;
char *test_filename;
unsigned test_max;
if (!list)
return NULL;
strcpy(path, dir);
if (*path)
strncat(path, "/", PATH_MAX - strlen(dir));
test_filename = path + strlen(path);
test_max = PATH_MAX - (test_filename - path);
for (i = list; *i; i++)
{
if (strlen(*i) >= test_max)
if (!path.copy_if(dlen, *i))
continue;
strcpy(test_filename, *i);
if (PHYSFS_isDirectory(path))
*j++ = *i;
else