Merge branch 'master' into tab_key

1 files changed, 9 insertions, 18 deletions

diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index d5582d00ed..6817137a94 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -126,37 +126,28 @@ 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 "";
 	}
 
 	String fname = fix_unicode_name(entry->d_name);
 
-	if (entry->d_type == DT_UNKNOWN) {
-		//typedef struct stat Stat;
-		struct stat flags;
-
+	// 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) {
-
-			if (S_ISDIR(flags.st_mode)) {
-
-				_cisdir = true;
-
-			} else {
-
-				_cisdir = false;
-			}
-
+			_cisdir = S_ISDIR(flags.st_mode);
 		} else {
-
 			_cisdir = false;
 		}
 	} else {