zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 22:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Applied patch for fixing directory reading on Linux.

Browse source 
SVN r1628 (trunk)
This commit is contained in:
Christoph Oelckers 2009-06-01 06:43:32 +00:00
parent 91e0f4d11d
commit 14cdab7e39
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/resourcefiles/file_directory.cpp
View file

@ -208,7 +208,9 @@ int FDirectory::AddDirectory(const char *dirpath)
int FDirectory::AddDirectory(const char *dirpath)
{
char *argv [2] = {dirpath, NULL };
char *argv [2] = {NULL, NULL };
argv[0] = new char[strlen(dirpath)+1];
strcpy(argv[0], dirpath);
FTS *fts;
FTSENT *ent;
int count = 0;
@ -216,7 +218,7 @@ int FDirectory::AddDirectory(const char *dirpath)
fts = fts_open(argv, FTS_LOGICAL, NULL);
if (fts == NULL)
{
Printf "Failed to start directory traversal: %s\n", strerror(errno));
Printf("Failed to start directory traversal: %s\n", strerror(errno));
return NULL;
}
while ((ent = fts_read(fts)) != NULL)
@ -240,6 +242,7 @@ int FDirectory::AddDirectory(const char *dirpath)
count++;
}
fts_close(fts);
delete[] argv[0];
return count;
}
#endif

2
src/resourcefiles/resourcefile.h
View file

@ -61,7 +61,7 @@ private:
public:
static FResourceFile *OpenResourceFile(const char *filename, FileReader *file, bool quiet = false);
static FResourceFile *FResourceFile::OpenDirectory(const char *filename);
static FResourceFile *OpenDirectory(const char *filename);
virtual ~FResourceFile();
FileReader *GetReader() const { return Reader; }
DWORD LumpCount() const { return NumLumps; }