* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <dirent.h>
+#include <sys/types.h>
#include "fcint.h"
#if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
return 0;
}
-typedef struct _FcFileTime {
- time_t time;
- FcBool set;
-} FcFileTime;
-
static FcFileTime
FcConfigNewestFile (FcStrSet *files)
{
return newest;
}
+FcFileTime
+FcConfigModifiedTime (FcConfig *config)
+{
+ if (!config)
+ {
+ FcFileTime v = { 0, FcFalse };
+ config = FcConfigGetCurrent ();
+ if (!config)
+ return v;
+ }
+ return FcConfigNewestFile (config->configFiles);
+}
+
FcBool
FcConfigUptoDate (FcConfig *config)
{
goto bail2;
if (config->cache)
- FcGlobalCacheLoad (cache, oldDirs, config->cache);
+ FcGlobalCacheLoad (cache, oldDirs, config->cache, config);
cached_fonts = FcCacheRead(config, cache);
if (!cached_fonts)
for (i = 0; i < oldDirs->num; i++)
{
if (FcDebug () & FC_DBG_FONTSET)
- printf ("scan dir %s\n", dir);
+ printf ("scan dir %s\n", oldDirs->strs[i]);
FcDirScanConfig (fonts, config->fontDirs, cache,
config->blanks, oldDirs->strs[i],
FcFalse, config);
for (i = 0; i < cached_fonts->nfont; i++)
{
- if (FcConfigAcceptFont (config, cached_fonts->fonts[i]))
+ FcChar8 *cfn;
+ FcPatternGetString (cached_fonts->fonts[i], FC_FILE, 0, &cfn);
+
+ if (FcConfigAcceptFont (config, cached_fonts->fonts[i]) &&
+ (cfn && FcConfigAcceptFilename (config, cfn)))
FcFontSetAdd (fonts, cached_fonts->fonts[i]);
cached_fonts->fonts[i] = 0; /* prevent free in FcFontSetDestroy */
FcFontSetPrint (fonts);
if (config->cache)
- FcGlobalCacheSave (cache, config->cache);
+ FcGlobalCacheSave (cache, config->cache, config);
FcGlobalCacheDestroy (cache);
FcStrSetDestroy (oldDirs);
return FcTrue;
bail2:
+ FcGlobalCacheDestroy (cache);
FcStrSetDestroy (oldDirs);
bail1:
FcFontSetDestroy (fonts);
return FcStrListCreate (config->configDirs);
}
+static FcChar8 *
+FcConfigInodeMatchFontDir (FcConfig *config, const FcChar8 *d)
+{
+ int n;
+ ino_t di;
+ dev_t dd;
+ struct stat s;
+
+ /* first we do string matches rather than file accesses */
+ /* FcStrSetMember doesn't tell us the index so that we can return
+ * the config-owned copy. */
+ for (n = 0; n < config->fontDirs->num; n++)
+ {
+ if (!FcStrCmp (config->fontDirs->strs[n], d))
+ return config->fontDirs->strs[n];
+ }
+
+ /* If this is a bottleneck, we can cache the fontDir inodes. */
+ if (stat ((char *)d, &s) == -1)
+ return 0;
+ di = s.st_ino; dd = s.st_dev;
+
+ for (n = 0; n < config->fontDirs->num; n++)
+ {
+ if (stat ((char *)config->fontDirs->strs[n], &s) == -1)
+ continue;
+ if (di == s.st_ino && dd == s.st_dev)
+ return config->fontDirs->strs[n];
+ }
+ return 0;
+}
+
FcBool
FcConfigAddFontDir (FcConfig *config,
const FcChar8 *d)
{
+ /* Avoid adding d if it's an alias of something else, too. */
+ if (FcConfigInodeMatchFontDir(config, d))
+ return FcTrue;
return FcStrSetAddFilename (config->fontDirs, d);
}
+static FcBool
+FcConfigAddFontDirSubdirs (FcConfig *config,
+ const FcChar8 *d)
+{
+ DIR *dir;
+ struct dirent *e;
+ FcChar8 *subdir;
+ FcBool added = FcFalse;
+
+ if (!(dir = opendir ((char *) d)))
+ return FcFalse;
+ if (!(subdir = (FcChar8 *) malloc (strlen ((char *) d) + FC_MAX_FILE_LEN + 2)))
+ {
+ fprintf (stderr, "out of memory");
+ return FcFalse;
+ }
+ while ((e = readdir (dir)))
+ {
+ if (strcmp (e->d_name, ".") && strcmp (e->d_name, "..") &&
+ strlen (e->d_name) < FC_MAX_FILE_LEN)
+ {
+ strcpy ((char *)subdir, (char *)d);
+ strcat ((char *)subdir, "/");
+ strcat ((char *)subdir, e->d_name);
+ if (FcFileIsDir (subdir))
+ {
+ if (FcConfigInodeMatchFontDir(config, subdir))
+ continue; /* already added */
+ FcStrSetAddFilename (config->fontDirs, subdir);
+ FcConfigAddFontDirSubdirs (config, subdir);
+ added = FcTrue;
+ }
+ }
+ }
+ free (subdir);
+ closedir (dir);
+ return added;
+}
+
+const FcChar8 *
+FcConfigNormalizeFontDir (FcConfig *config,
+ const FcChar8 *d)
+{
+ FcChar8 *d0;
+ int n, n0;
+ FcBool added = FcFalse;
+
+ d0 = FcConfigInodeMatchFontDir(config, d);
+ if (d0)
+ return d0;
+
+ /* Ok, we didn't find it in fontDirs; let's add subdirs.... */
+ for (n = 0, n0 = config->fontDirs->num; n < n0; n++)
+ {
+ if (FcConfigAddFontDirSubdirs (config, config->fontDirs->strs[n]))
+ added = FcTrue;
+ }
+
+ /* ... and try again. */
+ if (added)
+ return FcConfigInodeMatchFontDir(config, d);
+
+ return 0;
+}
+
FcBool
FcConfigAddDir (FcConfig *config,
const FcChar8 *d)
FcValue v, vl, vr;
FcResult r;
FcMatrix *m;
+ FcChar8 *str;
switch (e->op) {
case FcOpInteger:
case FcOpString:
v.type = FcTypeString;
v.u.s = FcStrStaticName(e->u.sval);
- v = FcValueSave (v);
break;
case FcOpMatrix:
v.type = FcTypeMatrix;
r = FcPatternGet (p, e->u.field, 0, &v);
if (r != FcResultMatch)
v.type = FcTypeVoid;
+ v = FcValueSave (v);
break;
case FcOpConst:
if (FcNameConstant (e->u.constant, &v.u.i))
switch (e->op) {
case FcOpPlus:
v.type = FcTypeString;
- v.u.s = FcStrStaticName (FcStrPlus (vl.u.s, vr.u.s));
+ str = FcStrPlus (vl.u.s, vr.u.s);
+ v.u.s = FcStrStaticName (str);
+ FcStrFree (str);
if (!v.u.s)
v.type = FcTypeVoid;
FcConfigValues (FcPattern *p, FcExpr *e, FcValueBinding binding)
{
FcValueList *l;
- FcValueListPtr lp;
if (!e)
return 0;
l->next = FcValueListPtrCreateDynamic(0);
}
l->binding = binding;
- lp = FcValueListPtrCreateDynamic(l);
- while (FcValueListPtrU(lp) && FcValueListPtrU(lp)->value.type == FcTypeVoid)
+ if (l->value.type == FcTypeVoid)
{
- FcValueListPtr next = FcValueListPtrU(lp)->next;
+ FcValueList *next = FcValueListPtrU(l->next);
- if (lp.bank == FC_BANK_DYNAMIC)
- {
- FcMemFree (FC_MEM_VALLIST, sizeof (FcValueList));
- free (l);
- }
- lp = next;
+ FcMemFree (FC_MEM_VALLIST, sizeof (FcValueList));
+ free (l);
+ l = next;
}
+
return l;
}
}
FcStrListDone (sublist);
}
+ FcStrSetDestroy (subdirs);
return FcTrue;
}
}
FcStrListDone (sublist);
}
+ FcStrSetDestroy (subdirs);
return FcTrue;
}
git.wh0rd.org / fontconfig.git / blobdiff