Warn (and recover) from config file without <cachedir> elements.

[fontconfig.git] / src / fcinit.c

diff --git a/src/fcinit.c b/src/fcinit.c
index 7d2311fae2bdb5fc9112f2ea772c5d731f52ec0d..693e0b7b3362eadb712c64a1fe6a065ec6576d55 100644 (file)
--- a/src/fcinit.c
+++ b/src/fcinit.c
@@ -69,6 +69,25 @@ FcInitLoadConfig (void)
        FcConfigDestroy (config);
        return FcInitFallbackConfig ();
     }
+    
+    if (config->cacheDirs && config->cacheDirs->num == 0)
+    {
+       fprintf (stderr,
+                "Fontconfig warning: no <cachedir> elements found. Check configuration.\n");
+       fprintf (stderr,
+                "Fontconfig warning: adding <cachedir>%s</cachedir>\n",
+                FC_CACHEDIR);
+       fprintf (stderr,
+                "Fontconfig warning: adding <cachedir>~/.fontconfig</cachedir>\n");
+       if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR) ||
+           !FcConfigAddCacheDir (config, (FcChar8 *) "~/.fontconfig"))
+       {
+           fprintf (stderr,
+                    "Fontconfig error: out of memory");
+           FcConfigDestroy (config);
+           return FcInitFallbackConfig ();
+       }
+    }
 
     return config;
 }