From 30c4189deb8412793d175bce255561a882ad81b7 Mon Sep 17 00:00:00 2001
From: Patrick Lam <plam@MIT.EDU>
Date: Mon, 30 Jan 2006 04:47:17 +0000
Subject: [PATCH] Fix global cache reads of subdirectories. reviewed by: plam

---
 ChangeLog     | 7 +++++++
 src/fccache.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 17c2c56..727ce0a 100644
--- 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 924494f..853ae0e 100644
--- 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;