mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take the slow but more correct path for directory sorting.

Browse Source
This commit is contained in:
Themaister 2012-06-19 00:16:59 +02:00
parent 7d05d051b4
commit f0fab577e7
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver.c
View File

@ -484,7 +484,7 @@ static void init_shader_dir(void)
g_extern.shader_dir.size = dir_list_size(g_extern.shader_dir.elems); g_extern.shader_dir.size = dir_list_size(g_extern.shader_dir.elems);
g_extern.shader_dir.ptr = 0; g_extern.shader_dir.ptr = 0;
dir_list_sort(g_extern.shader_dir.elems); dir_list_sort(g_extern.shader_dir.elems, false);
for (unsigned i = 0; i < g_extern.shader_dir.size; i++) for (unsigned i = 0; i < g_extern.shader_dir.size; i++)
RARCH_LOG("Found shader \"%s\"\n", g_extern.shader_dir.elems[i]); RARCH_LOG("Found shader \"%s\"\n", g_extern.shader_dir.elems[i]);

2
file.h
View File

@ -41,7 +41,7 @@ bool init_rom_file(enum rarch_game_type type);
// If non-NULL, only files with extension ext are added. // If non-NULL, only files with extension ext are added.
char **dir_list_new(const char *dir, const char *ext, bool include_dirs); char **dir_list_new(const char *dir, const char *ext, bool include_dirs);
size_t dir_list_size(char * const *dir_list); size_t dir_list_size(char * const *dir_list);
void dir_list_sort(char **dir_list); void dir_list_sort(char **dir_list, bool dir_first);
void dir_list_free(char **dir_list); void dir_list_free(char **dir_list);
bool path_is_directory(const char *path); bool path_is_directory(const char *path);

34
file_path.c
View File

@ -173,43 +173,31 @@ size_t dir_list_size(char * const *dir_list)
return size; return size;
} }
static size_t strcountelem(const char *str, const char *valid) static int qstrcmp_plain(const void *a, const void *b)
{ {
size_t count = 0; return strcasecmp(*(const char * const*)a, *(const char * const*)b);
while (*str)
{
if (strchr(valid, *str++))
count++;
}
return count;
} }
static int qstrcmp(const void *a_, const void *b_) static int qstrcmp_dir(const void *a_, const void *b_)
{ {
const char *a = *(const char * const*)a_; const char *a = *(const char * const*)a_;
const char *b = *(const char * const*)b_; const char *b = *(const char * const*)b_;
ssize_t a_cnt = strcountelem(a, "/\\"); // Sort directories before files.
ssize_t b_cnt = strcountelem(b, "/\\"); int a_dir = path_is_directory(a);
int b_dir = path_is_directory(b);
if (a_dir != b_dir)
return b_dir - a_dir;
// Place directories on top. return strcasecmp(a, b);
// It is assumed that number of '/' or '\\' in path can determine
// if one path is a directory and the other is not.
if (a_cnt != b_cnt)
return a_cnt - b_cnt;
else
return strcasecmp(a, b);
} }
void dir_list_sort(char **dir_list) void dir_list_sort(char **dir_list, bool dir_first)
{ {
if (!dir_list) if (!dir_list)
return; return;
qsort(dir_list, dir_list_size(dir_list), sizeof(char*), qstrcmp); qsort(dir_list, dir_list_size(dir_list), sizeof(char*), dir_first ? qstrcmp_dir : qstrcmp_plain);
} }
#ifdef _WIN32 // Because the API is just fucked up ... #ifdef _WIN32 // Because the API is just fucked up ...