Normalize font dirs by using the form, as given in fonts.conf, and recorded

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

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 388baa7651d3386cabf8887eeed3a2168e787952..6aa53a5a76bc5c2445909f572509f6ca157fffb3 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -183,7 +183,7 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
            FcStrSetDestroy (subdirs);
            continue;
        }
-       if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, force))
+       if (!FcDirScanConfig (set, subdirs, 0, FcConfigGetBlanks (config), dir, force, config))
        {
            fprintf (stderr, "\"%s\": error scanning\n", dir);
            FcFontSetDestroy (set);
@@ -209,7 +209,9 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
 
            if (!FcDirSave (set, subdirs, dir))
            {
-               fprintf (stderr, "Can't save cache in \"%s\"\n", dir);
+                if (!ret)
+                    fprintf (stderr, "Caches are currently saved to \"%s\"\n", PKGCACHEDIR);
+               fprintf (stderr, "Can't save cache for \"%s\"\n", dir);
                ret++;
            }
        }