/*
* $RCSId: xc/lib/fontconfig/src/fcdir.c,v 1.9 2002/08/31 22:17:32 keithp Exp $
*
- * Copyright © 2000 Keith Packard
+ * Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include "fcint.h"
#include <dirent.h>
-static FcBool
+FcBool
FcFileIsDir (const FcChar8 *file)
{
struct stat statb;
FcConfig *config)
{
int id;
- FcChar8 *name;
FcPattern *font;
FcBool ret = FcTrue;
- FcBool isDir;
int count = 0;
- FcGlobalCacheFile *cache_file;
- FcGlobalCacheDir *cache_dir;
- FcBool need_scan;
if (config && !FcConfigAcceptFilename (config, file))
return FcTrue;
- if (force)
- cache = 0;
+ if (FcFileIsDir (file))
+ return FcStrSetAdd (dirs, file);
+
id = 0;
do
{
- need_scan = FcTrue;
font = 0;
- /*
- * Check the cache
- */
- if (cache)
- {
- if ((cache_file = FcGlobalCacheFileGet (cache, file, id, &count)))
- {
- /*
- * Found a cache entry for the file
- */
- if (FcGlobalCacheCheckTime (file, &cache_file->info))
- {
- name = cache_file->name;
- need_scan = FcFalse;
- FcGlobalCacheReferenced (cache, &cache_file->info);
- /* "." means the file doesn't contain a font */
- if (FcStrCmp (name, FC_FONT_FILE_INVALID) != 0)
- {
- font = FcNameParse (name);
- if (font)
- if (!FcPatternAddString (font, FC_FILE, file))
- ret = FcFalse;
- }
- }
- }
- else if ((cache_dir = FcGlobalCacheDirGet (cache, file,
- strlen ((const char *) file),
- FcFalse)))
- {
- if (FcGlobalCacheCheckTime (cache_dir->info.file,
- &cache_dir->info))
- {
- font = 0;
- need_scan = FcFalse;
- FcGlobalCacheReferenced (cache, &cache_dir->info);
- if (!FcStrSetAdd (dirs, file))
- ret = FcFalse;
- }
- }
- }
/*
* Nothing in the cache, scan the file
*/
- if (need_scan)
+ if (FcDebug () & FC_DBG_SCAN)
{
- if (FcDebug () & FC_DBG_SCAN)
- {
- printf ("\tScanning file %s...", file);
- fflush (stdout);
- }
- 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);
- }
- /*
- * Update the cache
- */
- if (cache && font)
- {
- FcChar8 *unparse;
-
- unparse = FcNameUnparse (font);
- if (unparse)
- {
- (void) FcGlobalCacheUpdate (cache, file, id, unparse);
- FcStrFree (unparse);
- }
- }
+ printf ("\tScanning file %s...", file);
+ fflush (stdout);
}
+ font = FcFreeTypeQuery (file, id, blanks, &count);
+ if (FcDebug () & FC_DBG_SCAN)
+ printf ("done\n");
/*
* Add the font
*/
- if (font)
+ if (font && (!config || FcConfigAcceptFont (config, font)))
{
if (!FcFontSetAdd (set, font))
{
ret = FcFalse;
}
}
+ else if (font)
+ FcPatternDestroy (font);
id++;
} while (font && ret && id < count);
return ret;
return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
}
-#define FC_MAX_FILE_LEN 4096
+/*
+ * 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);
+}
/*
* Scan 'dir', adding font files to 'set' and
{
DIR *d;
struct dirent *e;
+ FcChar8 **dirlist;
+ int dirlistlen, dirlistalloc;
FcChar8 *file;
FcChar8 *base;
FcBool ret = FcTrue;
+ FcFontSet *tmpSet;
+ int i;
if (config && !FcConfigAcceptFilename (config, dir))
return FcTrue;
if (!force)
{
- /*
- * Check fonts.cache-<version> file
- */
- if (FcDirCacheReadDir (set, dirs, dir, config))
- {
- if (cache)
- FcGlobalCacheReferenceSubdir (cache, dir);
- return FcTrue;
- }
-
/*
* Check ~/.fonts.cache-<version> file
*/
- if (cache && FcGlobalCacheScanDir (set, dirs, cache, dir, config))
+ if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
+ return FcTrue;
+
+ if (FcDirCacheValid (dir, config) &&
+ FcDirCacheHasCurrentArch (dir, config) &&
+ FcDirCacheRead (set, dirs, dir, config))
return FcTrue;
}
printf ("\tScanning dir %s\n", dir);
d = opendir ((char *) dir);
-
if (!d)
{
free (file);
return FcTrue;
return FcFalse;
}
- while (ret && (e = readdir (d)))
+
+ tmpSet = FcFontSetCreate();
+ if (!tmpSet)
+ {
+ ret = FcFalse;
+ goto bail0;
+ }
+
+ dirlistlen = 0;
+ dirlistalloc = 8;
+ dirlist = malloc(dirlistalloc * sizeof(FcChar8 *));
+ if (!dirlist)
+ {
+ ret = FcFalse;
+ goto bail1;
+ }
+ 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 (set, dirs, cache, blanks, file, force, config);
+ 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])
+ {
+ ret = FcFalse;
+ goto bail2;
+ }
+ strcpy((char *)dirlist[dirlistlen], e->d_name);
+ dirlistlen++;
}
}
- free (file);
- closedir (d);
+ 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
*/
if (ret && cache)
- FcGlobalCacheUpdate (cache, dir, 0, 0);
-
+ 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));
+
+ bail2:
+ for (i = 0; i < dirlistlen; i++)
+ free(dirlist[i]);
+
+ free (dirlist);
+
+ bail1:
+ free (tmpSet);
+
+ bail0:
+ closedir (d);
+
+ free (file);
return ret;
}
}
FcBool
-FcDirSave (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
+FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
{
- return FcDirCacheWriteDir (set, dirs, dir);
+ return FcDirCacheWrite (set, dirs, dir, FcConfigGetCurrent ());
}
git.wh0rd.org / fontconfig.git / blobdiff