Move FcConfigNormalizeFontDir call so that it doesn't result in infinite

[fontconfig.git] / fc-cache / fc-cache.c

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 4900e45e357134faf72632326a80b67378caba70..2d6c2c3140d9eceb9ea11a841385dc712b902f0c 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -112,7 +112,7 @@ static int
 scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose)
 {
     int                ret = 0;
-    FcChar8    *dir;
+    const FcChar8 *dir;
     FcFontSet  *set;
     FcStrSet   *subdirs;
     FcStrList  *sublist;
@@ -124,6 +124,10 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
      */
     while ((dir = FcStrListNext (list)))
     {
+       dir = FcConfigNormalizeFontDir (config, dir);
+       if (!dir)
+           return FcFalse;
+
        if (verbose)
        {
            printf ("%s: \"%s\": ", program, dir);