Fix global cache reads of subdirectories.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 17c2c56b9b4b82761bf4bb4c81b56a8527ade7e3..727ce0a0f14d0aa2fed2a307212e499534038420 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * doc/fcconfig.fncs:
        Add documentation for FcConfigNormalizeFontDir.

diff --git a/src/fccache.c b/src/fccache.c
index 924494f24ee07637fc982d43f912f8a633e3d599..853ae0e1d00bef2769867628a150868722ee898c 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -319,7 +319,7 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
        if (strncmp (d->name, dir, strlen(dir)) == 0)
        {
            lseek (cache->fd, d->offset, SEEK_SET);
-           if (!FcDirCacheConsume (cache->fd, dir, set, config))
+           if (!FcDirCacheConsume (cache->fd, d->name, set, config))
                return FcFalse;
             if (strcmp (d->name, dir) == 0)
                ret = FcTrue;