From afea659fefe263040088e6dc8813cb18a6f3d219 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 19 Apr 2016 12:01:05 +0100 Subject: move dir_sort_alpha function from generic utils to one specific place it is used --- content/fetchers/file.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'content/fetchers') diff --git a/content/fetchers/file.c b/content/fetchers/file.c index ff40386fe..d13b4d56a 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -24,6 +24,7 @@ #include "utils/config.h" +#include #include #include #include @@ -601,6 +602,48 @@ process_dir_ent(struct fetch_file_context *ctx, return NSERROR_OK; } +/** + * Comparison function for sorting directories. + * + * Correctly orders non zero-padded numerical parts. + * ie. produces "file1, file2, file10" rather than "file1, file10, file2". + * + * \param d1 first directory entry + * \param d2 second directory entry + */ +static int dir_sort_alpha(const struct dirent **d1, const struct dirent **d2) +{ + const char *s1 = (*d1)->d_name; + const char *s2 = (*d2)->d_name; + + while (*s1 != '\0' && *s2 != '\0') { + if ((*s1 >= '0' && *s1 <= '9') && + (*s2 >= '0' && *s2 <= '9')) { + int n1 = 0, n2 = 0; + while (*s1 >= '0' && *s1 <= '9') { + n1 = n1 * 10 + (*s1) - '0'; + s1++; + } + while (*s2 >= '0' && *s2 <= '9') { + n2 = n2 * 10 + (*s2) - '0'; + s2++; + } + if (n1 != n2) { + return n1 - n2; + } + if (*s1 == '\0' || *s2 == '\0') + break; + } + if (tolower(*s1) != tolower(*s2)) + break; + + s1++; + s2++; + } + + return tolower(*s1) - tolower(*s2); +} + static void fetch_file_process_dir(struct fetch_file_context *ctx, struct stat *fdstat) { -- cgit v1.2.3