summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-22 11:59:09 +0200
committerGitHub <noreply@github.com>2019-07-22 11:59:09 +0200
commit4b1ec08bc350f580c289cb2e919ce6ed5d4f4d45 (patch)
treeac8615be28c098fbba04529329025f0f2b7ffe55
parentad616feda261f63bf2dd8ff0951bda58a90711ce (diff)
parentee9f46423b85d6fbcfa43380c70cc7d0f3eff8f7 (diff)
Merge pull request #30726 from GodotExplorer/revert-30657-optimize_dir_access_unix_get_next
Revert "Optimize DirAccessUnix::get_next() for some file systems"
-rw-r--r--drivers/unix/dir_access_unix.cpp24
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index d5582d00ed..251bab5783 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -136,31 +136,27 @@ String DirAccessUnix::get_next() {
return "";
}
- String fname = fix_unicode_name(entry->d_name);
-
- if (entry->d_type == DT_UNKNOWN) {
- //typedef struct stat Stat;
- struct stat flags;
-
- String f = current_dir.plus_file(fname);
+ //typedef struct stat Stat;
+ struct stat flags;
- if (stat(f.utf8().get_data(), &flags) == 0) {
+ String fname = fix_unicode_name(entry->d_name);
- if (S_ISDIR(flags.st_mode)) {
+ String f = current_dir.plus_file(fname);
- _cisdir = true;
+ if (stat(f.utf8().get_data(), &flags) == 0) {
- } else {
+ if (S_ISDIR(flags.st_mode)) {
- _cisdir = false;
- }
+ _cisdir = true;
} else {
_cisdir = false;
}
+
} else {
- _cisdir = (entry->d_type == DT_DIR);
+
+ _cisdir = false;
}
_cishidden = (fname != "." && fname != ".." && fname.begins_with("."));