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

On Unix, check for symlinks from readdir(), and look through them (using stat()) to discern target type.

Browse Source
This commit is contained in:
James Turner
2010-07-21 22:08:06 +01:00
parent 17bcd4e2ab
commit 63cbd4deb0
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
simgear/misc/sg_dir.cxx
View File

@@ -29,6 +29,8 @@
# include <dirent.h>
#endif
#include <sys/stat.h>
#include <simgear/debug/logstream.hxx>
#include <cstring>
@@ -110,8 +112,26 @@ PathList Dir::children(int types, const std::string& nameFilter) const
if (!(types & INCLUDE_HIDDEN) && (entry->d_name[0] == '.')) {
continue;
}
if (entry->d_type == DT_DIR) {
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
if (type == DT_DIR) {
if (!(types & TYPE_DIR)) {
continue;
}
@@ -121,7 +141,7 @@ PathList Dir::children(int types, const std::string& nameFilter) const
continue;
}
}
} else if (entry->d_type == DT_REG) {
} else if (type == DT_REG) {
if (!(types & TYPE_FILE)) {
continue;
}