Browse Source

Revert "Optimize DirAccessUnix::get_next() for some file systems"

Geequlim 6 years ago
parent
commit
ee9f46423b
1 changed files with 10 additions and 14 deletions
  1. 10 14
      drivers/unix/dir_access_unix.cpp

+ 10 - 14
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("."));