FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix simgear::Dir::children on Linux where dirent->d_type might be 0; always use stat() to determine file type. Thanks to Alex Romonsan for helping debugging this!

Browse Source
This commit is contained in:
James Turner
2010-07-24 10:27:50 +01:00
parent c5ec6927b3
commit 959f44502b
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
simgear/misc/sg_dir.cxx
View File

@@ -119,25 +119,13 @@ PathList Dir::children(int types, const std::string& nameFilter) const
continue;
}
int type = entry->d_type;
if (type == DT_LNK) {
// find symlink target type using stat()
struct stat s;
if (stat(file(entry->d_name).c_str(), &s)) {
continue; // stat() failed
}
if (S_ISDIR(s.st_mode)) {
type = DT_DIR;
} else if (S_ISREG(s.st_mode)) {
type = DT_REG;
} else {
// symlink to block/fifo/char file, ignore
continue;
}
} // of symlink look-through
struct stat s;
if (stat(file(entry->d_name).c_str(), &s)) {
continue; // stat() failed
}
if (type == DT_DIR) {
if (S_ISDIR(s.st_mode)) {
// directory handling
if (!(types & TYPE_DIR)) {
continue;
}
@@ -147,14 +135,16 @@ PathList Dir::children(int types, const std::string& nameFilter) const
continue;
}
}
} else if (type == DT_REG) {
} else if (S_ISREG(s.st_mode)) {
// regular file handling
if (!(types & TYPE_FILE)) {
continue;
}
} else {
continue; // ignore char/block devices, fifos, etc
// block device /fifo/char file, ignore
continue;
}
if (!nameFilter.empty()) {
if (strstr(entry->d_name, nameFilter.c_str()) == NULL) {
continue;