novaburst
/
gmrun
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

gtkcompletionline.c: (scandir) use standard alphasort

This commit is contained in:
wdlkmpx 2020-10-05 17:03:12 +08:00
parent 90a73af854
commit 4930aa9240
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtkcompletionline.c
View File

@ -417,20 +417,6 @@ static int select_executables_only(const struct dirent* dent)
return 0;
}
/* Quicksort callback for scandir, compares two dirent */
#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
int my_alphasort (const struct dirent **a, const struct dirent **b)
#else
int my_alphasort (const void *_a, const void *_b)
#endif
{
#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
dirent const * const *a = (dirent const * const *)_a;
dirent const * const *b = (dirent const * const *)_b;
#endif
return (strcmp ((*a)->d_name, (*b)->d_name));
}
/* Iterates though PATH and list all executables */
static GList * generate_execs_list (char * pfix)
{
@ -448,7 +434,7 @@ static GList * generate_execs_list (char * pfix)
while (*path_gc_i)
{
struct dirent **eps;
int n = scandir(*path_gc_i, &eps, select_executables_only, my_alphasort);
int n = scandir (*path_gc_i, &eps, select_executables_only, alphasort);
if (n >= 0) {
for (int j = 0; j < n; j++) {
execs_gc = g_list_prepend (execs_gc, g_strdup (eps[j]->d_name));
@ -501,7 +487,7 @@ static GList * generate_dirlist (const char * path)
char * file;
int n, len;
n = scandir (dir, &eps, select_executables_only, my_alphasort);
n = scandir (dir, &eps, select_executables_only, alphasort);
if (n >= 0) {
for (int j = 0; j < n; j++)
{