MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for unix filesystems which yield DT_UNKNOWN in dirent->d_type, falling back on stat().

master
Perttu Ahola 2011-12-04 12:49:58 +02:00
parent bc5cc638fc
commit ab67985d21
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/filesys.cpp
View File

@ -190,9 +190,34 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
if(dirp->d_name[0]!='.'){
DirListNode node;
node.name = dirp->d_name;
if(dirp->d_type == DT_DIR) node.dir = true;
else node.dir = false;
if(node.name != "." && node.name != "..")
if(node.name == "." || node.name == "..")
continue;
int isdir = -1; // -1 means unknown
/*
POSIX doesn't define d_type member of
struct dirent and certain filesystems on
glibc/Linux will only return DT_UNKNOWN for
the d_type member.
*/
#ifdef _DIRENT_HAVE_D_TYPE
if(dirp->d_type != DT_UNKNOWN)
isdir = (dirp->d_type == DT_DIR);
#endif /* _DIRENT_HAVE_D_TYPE */
/*
Was d_type DT_UNKNOWN (or nonexistent)?
If so, try stat().
*/
if(isdir == -1)
{
struct stat statbuf;
if (stat((pathstring + "/" + node.name).c_str(), &statbuf))
continue;
isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
}
node.dir = isdir;
listing.push_back(node);
}
}