return S_ISDIR(statb.st_mode);
}
-FcBool
-FcFileScanConfig (FcFontSet *set,
- FcStrSet *dirs,
- FcGlobalCache *cache,
- FcBlanks *blanks,
- const FcChar8 *file,
- FcBool force,
- FcConfig *config)
+static FcBool
+FcFileScanFontConfig (FcFontSet *set,
+ FcBlanks *blanks,
+ const FcChar8 *file,
+ FcConfig *config)
{
- int id;
- FcPattern *font;
- FcBool ret = FcTrue;
- FcBool isDir;
- int count = 0;
+ FcPattern *font;
+ FcBool ret = FcTrue;
+ int id;
+ int count = 0;
- if (config && !FcConfigAcceptFilename (config, file))
- return FcTrue;
-
- if (force)
- cache = 0;
id = 0;
do
{
font = FcFreeTypeQuery (file, id, blanks, &count);
if (FcDebug () & FC_DBG_SCAN)
printf ("done\n");
- isDir = FcFalse;
- if (!font && FcFileIsDir (file))
- {
- isDir = FcTrue;
- ret = FcStrSetAdd (dirs, file);
- }
/*
* Add the font
*/
return ret;
}
+FcBool
+FcFileScanConfig (FcFontSet *set,
+ FcStrSet *dirs,
+ FcBlanks *blanks,
+ const FcChar8 *file,
+ FcBool force,
+ FcConfig *config)
+{
+ if (config && !FcConfigAcceptFilename (config, file))
+ return FcTrue;
+
+ if (FcFileIsDir (file))
+ return FcStrSetAdd (dirs, file);
+ else
+ return FcFileScanFontConfig (set, blanks, file, config);
+}
+
FcBool
FcFileScan (FcFontSet *set,
FcStrSet *dirs,
- FcGlobalCache *cache,
+ FcFileCache *cache, /* XXX unused */
FcBlanks *blanks,
const FcChar8 *file,
FcBool force)
{
- return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
+ return FcFileScanConfig (set, dirs, blanks, file, force, 0);
+}
+
+/*
+ * Strcmp helper that takes pointers to pointers, copied from qsort(3) manpage
+ */
+
+static int
+cmpstringp(const void *p1, const void *p2)
+{
+ return strcmp(* (char **) p1, * (char **) p2);
}
/*
FcBool
FcDirScanConfig (FcFontSet *set,
FcStrSet *dirs,
- FcGlobalCache *cache,
FcBlanks *blanks,
const FcChar8 *dir,
FcBool force,
{
DIR *d;
struct dirent *e;
+ FcStrSet *dirlist, *filelist;
FcChar8 *file;
FcChar8 *base;
FcBool ret = FcTrue;
if (!force)
{
- /*
- * Check ~/.fonts.cache-<version> file
- */
- if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
- return FcTrue;
-
- if (FcDirCacheValid (dir) && FcDirCacheRead (set, dirs, dir, config))
+ if (FcDirCacheRead (set, dirs, dir, config))
return FcTrue;
}
+ if (FcDebug () & FC_DBG_FONTSET)
+ printf ("cache scan dir %s\n", dir);
+
/* freed below */
file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
if (!file)
return FcFalse;
}
- FcConfigAddFontDir (config, dir);
tmpSet = FcFontSetCreate();
- if (!tmpSet)
- {
- free (file);
- return FcFalse;
+ if (!tmpSet)
+ {
+ ret = FcFalse;
+ goto bail0;
}
- while (ret && (e = readdir (d)))
+ dirlist = FcStrSetCreate ();
+ if (!dirlist)
+ {
+ ret = FcFalse;
+ goto bail1;
+ }
+ filelist = FcStrSetCreate ();
+ if (!filelist)
+ {
+ ret = FcFalse;
+ goto bail2;
+ }
+ while ((e = readdir (d)))
{
if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
{
strcpy ((char *) base, (char *) e->d_name);
- ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config);
+ if (FcFileIsDir (file)) {
+ if (!FcStrSetAdd (dirlist, file)) {
+ ret = FcFalse;
+ goto bail3;
+ }
+ } else {
+ if (!FcStrSetAdd (filelist, file)) {
+ ret = FcFalse;
+ goto bail3;
+ }
+ }
}
}
- free (file);
- closedir (d);
/*
- * Now that the directory has been scanned,
- * add the cache entry
+ * Sort files and dirs to make things prettier
*/
- if (ret && cache)
- FcGlobalCacheUpdate (cache, (char *)dir, tmpSet);
+ qsort(dirlist->strs, dirlist->num, sizeof(FcChar8 *), cmpstringp);
+ qsort(filelist->strs, filelist->num, sizeof(FcChar8 *), cmpstringp);
+
+ for (i = 0; i < filelist->num; i++)
+ FcFileScanFontConfig (tmpSet, blanks, filelist->strs[i], config);
+
+ if (FcShouldWriteFiles ())
+ {
+ /*
+ * Now that the directory has been scanned,
+ * write out the cache file
+ */
+ FcDirCacheWrite (tmpSet, dirlist, dir, config);
+ }
+ /*
+ * Add the discovered fonts to our internal non-cache list
+ */
for (i = 0; i < tmpSet->nfont; i++)
FcFontSetAdd (set, tmpSet->fonts[i]);
- if (tmpSet->fonts)
- {
- FcMemFree (FC_MEM_FONTPTR, tmpSet->sfont * sizeof (FcPattern *));
- free (tmpSet->fonts);
- }
- FcMemFree (FC_MEM_FONTSET, sizeof (FcFontSet));
- free (tmpSet);
-
+ /*
+ * the patterns in tmpset now belong to set; don't free them
+ */
+ tmpSet->nfont = 0;
+
+ /*
+ * Add the discovered directories to the list to be scanned
+ */
+ for (i = 0; i < dirlist->num; i++)
+ if (!FcStrSetAdd (dirs, dirlist->strs[i])) {
+ ret = FcFalse;
+ goto bail3;
+ }
+
+ bail3:
+ FcStrSetDestroy (filelist);
+ bail2:
+ FcStrSetDestroy (dirlist);
+ bail1:
+ FcFontSetDestroy (tmpSet);
+
+ bail0:
+ closedir (d);
+
+ free (file);
return ret;
}
FcBool
FcDirScan (FcFontSet *set,
FcStrSet *dirs,
- FcGlobalCache *cache,
+ FcFileCache *cache, /* XXX unused */
FcBlanks *blanks,
const FcChar8 *dir,
FcBool force)
{
- return FcDirScanConfig (set, dirs, cache, blanks, dir, force, 0);
+ return FcDirScanConfig (set, dirs, blanks, dir, force, 0);
}
FcBool
FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
{
- return FcDirCacheWrite (set, dirs, dir);
+ return FcDirCacheWrite (set, dirs, dir, FcConfigGetCurrent ());
}
git.wh0rd.org / fontconfig.git / blobdiff