From 0334e5a294dd6a36c94936f6c9c709e86773cf64 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Fri, 27 Oct 2006 10:26:50 -0700 Subject: [PATCH] Do not clean cache files for different architectures Use filenames to clean cache files for current architecture only. This is sufficient as cache files live in their own directory where filenames are under fontconfig control. --- fc-cache/fc-cache.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index bda8b14..acaa8ba 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -22,6 +22,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include "../fc-arch/fcarch.h" + #ifdef HAVE_CONFIG_H #include #else @@ -40,6 +42,7 @@ #include #include #include +#include #if defined (_WIN32) #define STRICT @@ -296,6 +299,12 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose) if (ent->d_name[0] == '.') continue; + /* skip cache files for different architectures and */ + /* files which are not cache files at all */ + if (strlen(ent->d_name) != 32 + strlen ("-" FC_ARCHITECTURE FC_CACHE_SUFFIX) || + strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX)) + continue; + file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name); if (!file_name) { -- 2.39.5