Automatically remove invalid cache files.

Cache files for missing or more recently modified directories are
automatically removed at the end of every fc-cache run.

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 8d602b7fc9defffdfe91ed49e07b14515e67c4ea..3700c4ad54e102444b99bf45bce49d3831086cf6 100644 (file)
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -35,7 +35,7 @@ install-data-local:
 uninstall-local:
        -$(RM) -rf "$(DESTDIR)$(pkgcachedir)"
 
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
+INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS)
 
 bin_PROGRAMS=fc-cache
 

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 9df90ccea2f0814836097a0abbde58ccdc172e0e..cf4ea6c36ab9a3b1139a40417475d910e26c4fbb 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -31,13 +31,15 @@
 #define HAVE_GETOPT 1
 #endif
 
-#include <fontconfig/fontconfig.h>
+#include "fcint.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <dirent.h>
 
 #if defined (_WIN32)
 #define STRICT
@@ -46,6 +48,10 @@
 #undef STRICT
 #endif
 
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #ifndef HAVE_GETOPT
 #define HAVE_GETOPT 0
 #endif
@@ -266,6 +272,126 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
     return ret;
 }
 
+FcCache *
+FcCacheFileMap (const FcChar8 *file, struct stat *file_stat)
+{
+    FcCache *cache;
+    int            fd;
+
+    fd = open (file, O_RDONLY | O_BINARY);
+    if (fd < 0)
+       return NULL;
+    if (fstat (fd, file_stat) < 0) {
+       close (fd);
+       return NULL;
+    }
+    if (FcDirCacheLoad (fd, file_stat->st_size, &cache)) {
+       close (fd);
+       return cache;
+    }
+    close (fd);
+    return NULL;
+}
+
+static FcBool
+cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
+{
+    DIR                *d;
+    struct dirent *ent;
+    char       *dir_base;
+    FcBool     ret = FcTrue;
+    FcBool     remove;
+    FcCache    *cache;
+    struct stat        file_stat;
+    struct stat        target_stat;
+
+    dir_base = FcStrPlus (dir, "/");
+    if (access ((char *) dir, W_OK|X_OK) != 0)
+    {
+       if (verbose)
+           printf ("%s: skipping unwritable cache directory\n", dir);
+       return FcTrue;
+    }
+    d = opendir (dir);
+    if (!d)
+    {
+       perror (dir);
+       return FcFalse;
+    }
+    while ((ent = readdir (d)))
+    {
+       FcChar8 *file_name;
+       FcChar8 *target_dir;
+
+       if (ent->d_name[0] == '.')
+           continue;
+       file_name = FcStrPlus (dir_base, ent->d_name);
+       if (!file_name)
+       {
+           fprintf (stderr, "%s: allocation failure\n", dir);
+           ret = FcFalse;
+           break;
+       }
+       cache = FcCacheFileMap (file_name, &file_stat);
+       if (!cache)
+       {
+           fprintf (stderr, "%s: invalid cache file: %s\n", dir, ent->d_name);
+           FcStrFree (file_name);
+           ret = FcFalse;
+           continue;
+       }
+       target_dir = FcCacheDir (cache);
+       remove = FcFalse;
+       if (stat (target_dir, &target_stat) < 0)
+       {
+           if (verbose)
+               printf ("%s: %s: missing directory: %s \n",
+                       dir, ent->d_name, target_dir);
+           remove = FcTrue;
+       }
+       else if (target_stat.st_mtime > file_stat.st_mtime)
+       {
+           if (verbose)
+               printf ("%s: %s: cache outdated: %s\n",
+                       dir, ent->d_name, target_dir);
+           remove = FcTrue;
+       }
+       if (remove)
+       {
+           if (unlink (file_name) < 0)
+           {
+               perror (file_name);
+               ret = FcFalse;
+           }
+       }
+        FcStrFree (file_name);
+    }
+    
+    closedir (d);
+    return ret;
+}
+
+static FcBool
+cleanCacheDirectories (FcConfig *config, FcBool verbose)
+{
+    FcStrList  *cache_dirs = FcConfigGetCacheDirs (config);
+    FcChar8    *cache_dir;
+    FcBool     ret = FcTrue;
+
+    if (!cache_dirs)
+       return FcFalse;
+    while ((cache_dir = FcStrListNext (cache_dirs)))
+    {
+       if (!cleanCacheDirectory (config, cache_dir, verbose))
+       {
+           ret = FcFalse;
+           break;
+       }
+    }
+    FcStrListDone (cache_dirs);
+    return ret;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -356,6 +482,8 @@ main (int argc, char **argv)
 
     FcStrSetDestroy (processed_dirs);
 
+    cleanCacheDirectories (config, verbose);
+
     /* 
      * Now we need to sleep a second  (or two, to be extra sure), to make
      * sure that timestamps for changes after this run of fc-cache are later

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index c033bdc776359ec1886ddacb39612d21750220f3..63407e1904c417bd353fc395dc6dafb9c304f180 100644 (file)
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -31,8 +31,7 @@
 #define HAVE_GETOPT 1
 #endif
 
-#include <fontconfig/fontconfig.h>
-#include <../src/fccache.c>
+#include "../src/fccache.c"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/src/fccache.c b/src/fccache.c
index 646f03af8dacb42e9b1275288f630a6bb7265212..5012581aa66e6d5bf7f6ee8043766e0e94979c86 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -241,8 +241,8 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir,
     return ret;
 }
 
-static FcBool
-FcCacheLoad (int fd, off_t size, void *closure)
+FcBool
+FcDirCacheLoad (int fd, off_t size, void *closure)
 {
     FcCache    *cache;
     FcBool     allocated = FcFalse;
@@ -308,7 +308,7 @@ FcDirCacheMap (const FcChar8 *dir, FcConfig *config)
     FcCache *cache = NULL;
 
     if (!FcDirCacheProcess (config, dir,
-                           FcCacheLoad,
+                           FcDirCacheLoad,
                            &cache))
        return NULL;
     return cache;

diff --git a/src/fcint.h b/src/fcint.h
index 1b92d75270bc63dcf83f75bb278d3cc50abe49d8..f95bb4762cb74da52fed07dd67672c0458478d90 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -511,7 +511,7 @@ FcDirCacheMap (const FcChar8 *dir, FcConfig *config);
     
 FcBool
 FcDirCacheLoad (int fd, off_t size, void *closure);
-
+    
 /* fccfg.c */
 
 FcBool