Fix global cache reads of subdirectories.

reviewed by: plam
This commit is contained in:
Patrick Lam 2006-01-30 04:47:17 +00:00
parent 971cf18018
commit 30c4189deb
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2006-01-29 Mike Fabian <mfabian@suse.de>
reviewed by: plam
* src/fccache.c (FcGlobalCacheReadDir):
Fix global cache reads of subdirectories.
2006-01-29 Patrick Lam <plam@mit.edu> 2006-01-29 Patrick Lam <plam@mit.edu>
* doc/fcconfig.fncs: * doc/fcconfig.fncs:
Add documentation for FcConfigNormalizeFontDir. Add documentation for FcConfigNormalizeFontDir.

View File

@ -319,7 +319,7 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
if (strncmp (d->name, dir, strlen(dir)) == 0) if (strncmp (d->name, dir, strlen(dir)) == 0)
{ {
lseek (cache->fd, d->offset, SEEK_SET); lseek (cache->fd, d->offset, SEEK_SET);
if (!FcDirCacheConsume (cache->fd, dir, set, config)) if (!FcDirCacheConsume (cache->fd, d->name, set, config))
return FcFalse; return FcFalse;
if (strcmp (d->name, dir) == 0) if (strcmp (d->name, dir) == 0)
ret = FcTrue; ret = FcTrue;