godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30911 from hadrien-psydk/optimize_dir_access_unix_get_next_lnk

Browse Source 
Optimize DirAccessUnix::get_next() for some file systems (with link support)
This commit is contained in:
Rémi Verschelde 2019-07-30 00:12:30 +02:00 committed by GitHub
commit 73d2a99761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/unix/dir_access_unix.cpp
View File

@ -126,37 +126,32 @@ String DirAccessUnix::get_next() {
if (!dir_stream)
return "";
dirent *entry;
entry = readdir(dir_stream);
dirent *entry = readdir(dir_stream);
if (entry == NULL) {
list_dir_end();
return "";
}
//typedef struct stat Stat;
struct stat flags;
String fname = fix_unicode_name(entry->d_name);
String f = current_dir.plus_file(fname);
if (stat(f.utf8().get_data(), &flags) == 0) {
if (S_ISDIR(flags.st_mode)) {
_cisdir = true;
// Look at d_type to determine if the entry is a directory, unless
// its type is unknown (the file system does not support it) or if
// the type is a link, in that case we want to resolve the link to
// known if it points to a directory. stat() will resolve the link
// for us.
if (entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK) {
String f = current_dir.plus_file(fname);
struct stat flags;
if (stat(f.utf8().get_data(), &flags) == 0) {
_cisdir = S_ISDIR(flags.st_mode);
} else {
_cisdir = false;
}
} else {
_cisdir = false;
_cisdir = (entry->d_type == DT_DIR);
}
_cishidden = (fname != "." && fname != ".." && fname.begins_with("."));