From 377f09f12a51a6a50e31decf68f54bd0cf9eab39 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 11 May 2016 18:54:22 +0200
Subject: [PATCH] Change back retro_dirent_is_dir to hopefully avoid sshfs
 issues - more rigorous testing should be applied before changing these
 functions

---
 libretro-common/file/retro_dirent.c    | 5 +----
 libretro-common/include/retro_dirent.h | 2 +-
 libretro-common/lists/dir_list.c       | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index bdb50094a9..15046be14c 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -158,7 +158,7 @@ const char *retro_dirent_get_name(struct RDIR *rdir)
  * Returns: true if directory listing entry is
  * a directory, false if not.
  */
-bool retro_dirent_is_dir(struct RDIR *rdir)
+bool retro_dirent_is_dir(struct RDIR *rdir, const char *path)
 {
 #if defined(_WIN32)
    const WIN32_FIND_DATA *entry = (const WIN32_FIND_DATA*)&rdir->entry;
@@ -174,18 +174,15 @@ bool retro_dirent_is_dir(struct RDIR *rdir)
    CellFsDirent *entry = (CellFsDirent*)&rdir->entry;
    return (entry->d_type == CELL_FS_TYPE_DIRECTORY);
 #elif defined(DT_DIR)
-   const char          *path  = NULL;
    const struct dirent *entry = (const struct dirent*)rdir->entry;
    if (entry->d_type == DT_DIR)
       return true;
    /* This can happen on certain file systems. */
-   path = retro_dirent_get_name(rdir);
    if (entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK)
       return path_is_directory(path);
    return false;
 #else
    /* dirent struct doesn't have d_type, do it the slow way ... */
-   const char *path = retro_dirent_get_name(rdir);
    return path_is_directory(path);
 #endif
 }
diff --git a/libretro-common/include/retro_dirent.h b/libretro-common/include/retro_dirent.h
index 65af28d11d..9b4f53b1d2 100644
--- a/libretro-common/include/retro_dirent.h
+++ b/libretro-common/include/retro_dirent.h
@@ -49,7 +49,7 @@ const char *retro_dirent_get_name(struct RDIR *rdir);
  * Returns: true if directory listing entry is
  * a directory, false if not.
  */
-bool retro_dirent_is_dir(struct RDIR *rdir);
+bool retro_dirent_is_dir(struct RDIR *rdir, const char *path);
 
 void retro_closedir(struct RDIR *rdir);
 
diff --git a/libretro-common/lists/dir_list.c b/libretro-common/lists/dir_list.c
index 5fb2b373e3..8bcb3f3fbe 100644
--- a/libretro-common/lists/dir_list.c
+++ b/libretro-common/lists/dir_list.c
@@ -188,7 +188,7 @@ struct string_list *dir_list_new(const char *dir,
       const char *file_ext            = path_get_extension(name);
 
       fill_pathname_join(file_path, dir, name, sizeof(file_path));
-      is_dir = retro_dirent_is_dir(entry);
+      is_dir = retro_dirent_is_dir(entry, file_path);
 
       ret    = parse_dir_entry(name, file_path, is_dir,
             include_dirs, include_compressed, list, ext_list, file_ext);