summaryrefslogtreecommitdiff
path: root/src/filelist.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-02-28 17:56:13 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-02-28 17:56:13 +0100
commite6a535093596d3732628b8114386eb9b72929a02 (patch)
tree09279aaf64051767df0880faaaf22636856770eb /src/filelist.c
parent8eaa39234a54fcdd3c9050a01790b152598af80d (diff)
parent5a2db8f2ffc4371d2e88a65567d85663e6d16b36 (diff)
Merge branch 'ulteq-natural-sort'
Diffstat (limited to 'src/filelist.c')
-rw-r--r--src/filelist.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/filelist.c b/src/filelist.c
index 9a4af27..453f795 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -397,14 +397,26 @@ void feh_file_dirname(char *dst, feh_file * f, int maxlen)
dst[n] = '\0';
}
+#ifdef HAVE_VERSCMP
+inline int strcmp_or_strverscmp(const char *s1, const char *s2)
+{
+ if (!opt.version_sort)
+ return(strcmp(s1, s2));
+ else
+ return(strverscmp(s1, s2));
+}
+#else
+#define strcmp_or_strverscmp strcmp
+#endif
+
int feh_cmp_filename(void *file1, void *file2)
{
- return(strcmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
+ return(strcmp_or_strverscmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
}
int feh_cmp_name(void *file1, void *file2)
{
- return(strcmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
+ return(strcmp_or_strverscmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
}
int feh_cmp_dirname(void *file1, void *file2)
@@ -413,7 +425,7 @@ int feh_cmp_dirname(void *file1, void *file2)
int cmp;
feh_file_dirname(dir1, FEH_FILE(file1), PATH_MAX);
feh_file_dirname(dir2, FEH_FILE(file2), PATH_MAX);
- if ((cmp = strcmp(dir1, dir2)) != 0)
+ if ((cmp = strcmp_or_strverscmp(dir1, dir2)) != 0)
return(cmp);
return(feh_cmp_name(file1, file2));
}