Fix thinko: actually, the whole global cache is stale if the global cache

is older than the (newest) config file.
This commit is contained in:
Patrick Lam 2005-11-02 06:39:23 +00:00
parent 2b25f00c50
commit 9090cb9ece
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2005-11-02 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheLoad):
Fix thinko: actually, the whole global cache is stale
if the global cache is older than the (newest) config file.
2005-11-02 Patrick Lam <plam@mit.edu> 2005-11-02 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheLoad): * src/fccache.c (FcGlobalCacheLoad):
* src/fccfg.c (FcConfigModifiedTime, FcConfigBuildFonts): * src/fccfg.c (FcConfigModifiedTime, FcConfigBuildFonts):

View File

@ -193,11 +193,11 @@ FcGlobalCacheLoad (FcGlobalCache *cache,
if (!strlen(name_buf)) if (!strlen(name_buf))
break; break;
/* Directory must be older than the global cache file, and /* Directory must be older than the global cache file; also
also must be older than the config file. */ cache must be newer than the config file. */
if (stat ((char *) name_buf, &dir_stat) < 0 || if (stat ((char *) name_buf, &dir_stat) < 0 ||
dir_stat.st_mtime > cache_stat.st_mtime || dir_stat.st_mtime > cache_stat.st_mtime ||
(config_time.set && dir_stat.st_mtime > config_time.time)) (config_time.set && cache_stat.st_mtime < config_time.time))
{ {
FcCache md; FcCache md;