exit (1);
}
+#if 0
static int
nsubdirs (FcStrSet *set)
{
{
fprintf (stderr, "Can't create directory set\n");
ret++;
+ FcFontSetDestroy (set);
continue;
}
perror ("");
ret++;
}
+ FcFontSetDestroy (set);
+ FcStrSetDestroy (subdirs);
continue;
}
if (stat ((char *) dir, &statb) == -1)
{
fprintf (stderr, "\"%s\": ", dir);
perror ("");
+ FcFontSetDestroy (set);
+ FcStrSetDestroy (subdirs);
ret++;
continue;
}
if (!S_ISDIR (statb.st_mode))
{
fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
+ FcFontSetDestroy (set);
+ FcStrSetDestroy (subdirs);
continue;
}
if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, force))
{
fprintf (stderr, "\"%s\": error scanning\n", dir);
+ FcFontSetDestroy (set);
+ FcStrSetDestroy (subdirs);
ret++;
continue;
}
}
FcFontSetDestroy (set);
sublist = FcStrListCreate (subdirs);
+ FcStrSetDestroy (subdirs);
if (!sublist)
{
fprintf (stderr, "Can't create subdir list in \"%s\"\n", dir);
continue;
}
ret += scanDirs (sublist, config, program, force, verbose);
- FcStrSetDestroy (subdirs);
}
FcStrListDone (list);
return ret;
}
+#endif
int
main (int argc, char **argv)
if (systemOnly)
FcConfigEnableHome (FcFalse);
- config = FcInitLoadConfig ();
+ FcCacheForce (FcTrue);
+ /* need to use FcInitLoadConfig when we use dirs */
+ FcInit ();
+ config = FcConfigGetCurrent ();
if (!config)
{
fprintf (stderr, "%s: Can't init font config library\n", argv[0]);
return 1;
}
+
+ /* We don't yet have per-directory caches. */
+ ret = (FcCacheWrite (config) == FcFalse);
+
+#if 0
if (argv[i])
{
dirs = FcStrSetCreate ();
else
list = FcConfigGetConfigDirs (config);
ret = scanDirs (list, config, argv[0], force, verbose);
+#endif
/*
* Now we need to sleep a second (or two, to be extra sure), to make
* sure that timestamps for changes after this run of fc-cache are later