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;
- int count = 0;
+ FcPattern *font;
+ FcBool ret = FcTrue;
+ int id;
+ int count = 0;
- if (config && !FcConfigAcceptFilename (config, file))
- return FcTrue;
-
- if (FcFileIsDir (file))
- return FcStrSetAdd (dirs, file);
-
id = 0;
do
{
return ret;
}
+FcBool
+FcFileScanConfig (FcFontSet *set,
+ FcStrSet *dirs,
+ FcBlanks *blanks,
+ const FcChar8 *file,
+ FcConfig *config)
+{
+ 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, NULL);
}
/*
* Strcmp helper that takes pointers to pointers, copied from qsort(3) manpage
*/
-
static int
cmpstringp(const void *p1, const void *p2)
{
}
/*
- * Scan 'dir', adding font files to 'set' and
- * subdirectories to 'dirs'
+ * Scan the specified directory and construct a cache of its contents
*/
-
-FcBool
-FcDirScanConfig (FcFontSet *set,
- FcStrSet *dirs,
- FcGlobalCache *cache,
- FcBlanks *blanks,
- const FcChar8 *dir,
- FcBool force,
- FcConfig *config)
+FcCache *
+FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
{
DIR *d;
struct dirent *e;
- FcChar8 **dirlist;
- int dirlistlen, dirlistalloc;
+ FcStrSet *files;
+ FcStrSet *dirs;
FcChar8 *file;
- const FcChar8 *d_can = 0;
FcChar8 *base;
FcBool ret = FcTrue;
- FcFontSet *tmpSet;
+ FcFontSet *set;
int i;
+ FcBlanks *blanks = FcConfigGetBlanks (config);
+ FcCache *cache = NULL;
- if (config && !FcConfigAcceptFilename (config, dir))
- return FcTrue;
-
- if (config)
- d_can = FcConfigNormalizeFontDir (config, dir);
- if (d_can)
- dir = d_can;
-
- if (!force)
- {
- /*
- * Check ~/.fonts.cache-<version> file
- */
- if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
- return FcTrue;
+ if (FcDebug () & FC_DBG_FONTSET)
+ printf ("cache scan dir %s\n", dir);
- if (FcDirCacheValid (dir) &&
- FcDirCacheHasCurrentArch (dir) &&
- FcDirCacheRead (set, dirs, dir, config))
- return FcTrue;
- }
-
/* freed below */
file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
- if (!file)
- return FcFalse;
+ if (!file) {
+ ret = FcFalse;
+ goto bail;
+ }
strcpy ((char *) file, (char *) dir);
strcat ((char *) file, "/");
d = opendir ((char *) dir);
if (!d)
{
- free (file);
/* Don't complain about missing directories */
if (errno == ENOENT)
- return FcTrue;
- return FcFalse;
+ ret = FcTrue;
+ else
+ ret = FcFalse;
+ goto bail_1;
}
- tmpSet = FcFontSetCreate();
- if (!tmpSet)
+ set = FcFontSetCreate();
+ if (!set)
{
ret = FcFalse;
goto bail0;
}
- dirlistlen = 0;
- dirlistalloc = 8;
- dirlist = malloc(dirlistalloc * sizeof(FcChar8 *));
- if (!dirlist)
+ files = FcStrSetCreate ();
+ if (!files)
{
ret = FcFalse;
goto bail1;
{
if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
{
- if (dirlistlen == dirlistalloc)
- {
- FcChar8 **tmp_dirlist;
-
- dirlistalloc *= 2;
- tmp_dirlist = realloc(dirlist,
- dirlistalloc * sizeof(FcChar8 *));
- if (!tmp_dirlist)
- {
- ret = FcFalse;
- goto bail2;
- }
- dirlist = tmp_dirlist;
- }
- dirlist[dirlistlen] = malloc(strlen (e->d_name) + 1);
- if (!dirlist[dirlistlen])
- {
+ strcpy ((char *) base, (char *) e->d_name);
+ if (!FcStrSetAdd (files, file)) {
ret = FcFalse;
goto bail2;
}
- strcpy((char *)dirlist[dirlistlen], e->d_name);
- dirlistlen++;
}
}
- qsort(dirlist, dirlistlen, sizeof(FcChar8 *), cmpstringp);
- i = 0;
- while (ret && i < dirlistlen)
- {
- strcpy ((char *) base, (char *) dirlist[i]);
- ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config);
- i++;
- }
+
/*
- * Now that the directory has been scanned,
- * add the cache entry
+ * Sort files to make things prettier
*/
- if (ret && cache)
- FcGlobalCacheUpdate (cache, dirs, (char *)dir, tmpSet, config);
-
- 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));
-
+ qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp);
+
+ dirs = FcStrSetCreate ();
+ if (!dirs)
+ goto bail2;
+
+ /*
+ * Scan file files to build font patterns
+ */
+ for (i = 0; i < files->num; i++)
+ FcFileScanConfig (set, dirs, blanks, files->strs[i], config);
+
+ /*
+ * Build the cache object
+ */
+ cache = FcDirCacheBuild (set, dir, dirs);
+ if (!cache)
+ goto bail3;
+
+ /*
+ * Write out the cache file, ignoring any troubles
+ */
+ FcDirCacheWrite (cache, config);
+
+ bail3:
+ FcStrSetDestroy (dirs);
bail2:
- for (i = 0; i < dirlistlen; i++)
- free(dirlist[i]);
-
- free (dirlist);
-
+ FcStrSetDestroy (files);
bail1:
- free (tmpSet);
+ FcFontSetDestroy (set);
bail0:
closedir (d);
+ bail_1:
free (file);
- return ret;
+ bail:
+ return cache;
+}
+
+/*
+ * Read (or construct) the cache for a directory
+ */
+FcCache *
+FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
+{
+ FcCache *cache = NULL;
+
+ if (config && !FcConfigAcceptFilename (config, dir))
+ return NULL;
+
+ /* Try to use existing cache file */
+ if (!force)
+ cache = FcDirCacheLoad (dir, config, NULL);
+
+ /* Not using existing cache file, construct new cache */
+ if (!cache)
+ cache = FcDirCacheScan (dir, config);
+
+ return cache;
+}
+
+FcBool
+FcDirScanConfig (FcFontSet *set,
+ FcStrSet *dirs,
+ FcBlanks *blanks,
+ const FcChar8 *dir,
+ FcBool force,
+ FcConfig *config)
+{
+ return FcFalse; /* XXX fixme */
}
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, NULL);
}
FcBool
FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
{
- return FcDirCacheWrite (set, dirs, dir);
+ return FcFalse; /* XXX deprecated */
}
git.wh0rd.org / fontconfig.git / blobdiff