* PERFORMANCE OF THIS SOFTWARE.
*/
-#include <fontconfig/fontconfig.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#else
#define HAVE_GETOPT 1
#endif
+#include <fontconfig/fontconfig.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#if defined (_WIN32)
#define STRICT
#include <windows.h>
{
int ret = 0;
const FcChar8 *dir;
- const FcChar8 *dir_orig;
FcFontSet *set;
FcStrSet *subdirs;
FcStrList *sublist;
* Now scan all of the directories into separate databases
* and write out the results
*/
- while ((dir_orig = FcStrListNext (list)))
+ while ((dir = FcStrListNext (list)))
{
- dir = FcConfigNormalizeFontDir (config, dir_orig);
-
if (verbose)
{
- printf ("%s: \"%s\": ", program, dir ? dir : dir_orig);
+ printf ("%s: \"%s\": ", program, dir);
fflush (stdout);
}
if (really_force)
FcDirCacheUnlink (dir, config);
- if (!FcDirScanConfig (set, subdirs, 0, FcConfigGetBlanks (config), dir, force, config))
+ if (!FcDirScanConfig (set, subdirs, FcConfigGetBlanks (config), dir, force, config))
{
fprintf (stderr, "\"%s\": error scanning\n", dir);
FcFontSetDestroy (set);
ret++;
continue;
}
- if (!force && FcDirCacheValid (dir) && FcDirCacheHasCurrentArch (dir))
+ if (!force && FcDirCacheValid (dir, config))
{
if (verbose)
printf ("skipping, %d fonts, %d dirs\n",
/* This is the only reason we can't combine
* Valid w/HasCurrentArch... */
- if (!FcDirCacheValid (dir))
+ if (!FcDirCacheValid (dir, config))
if (!FcDirCacheUnlink (dir, config))
ret++;
if (!FcDirSave (set, subdirs, dir))
{
- if (!ret)
- fprintf (stderr, "Caches are currently saved to \"%s\"\n", PKGCACHEDIR);
fprintf (stderr, "Can't save cache for \"%s\"\n", dir);
ret++;
}