From: Keith Packard <keithp@neko.keithp.com>
Date: Sun, 10 Sep 2006 04:21:01 +0000 (-0700)
Subject: Fix conf.d directory sorting.
X-Git-Tag: 2.4.0~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9419bb34f6eac685fcf957faf6a38a5cdfa811d9;p=fontconfig.git

Fix conf.d directory sorting.

Sort was using broken comparison function.
---

diff --git a/src/fcxml.c b/src/fcxml.c
index 4087183..a9453eb 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2281,6 +2281,14 @@ FcEndDoctypeDecl (void *userData)
 
 #endif /* ENABLE_LIBXML2 */
 
+static int
+FcSortCmpStr (const void *a, const void *b)
+{
+    const FcChar8    *as = *((FcChar8 **) a);
+    const FcChar8    *bs = *((FcChar8 **) b);
+    return FcStrCmp (as, bs);
+}
+
 static FcBool
 FcConfigParseAndLoadDir (FcConfig	*config,
 			 const FcChar8	*name,
@@ -2350,7 +2358,7 @@ FcConfigParseAndLoadDir (FcConfig	*config,
     {
 	int i;
 	qsort (files->strs, files->num, sizeof (FcChar8 *), 
-	       (int (*)(const void *, const void *)) FcStrCmp);
+	       (int (*)(const void *, const void *)) FcSortCmpStr);
 	for (i = 0; ret && i < files->num; i++)
 	    ret = FcConfigParseAndLoad (config, files->strs[i], complain);
     }