X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-cache%2Ffc-cache.c;h=cf4ea6c36ab9a3b1139a40417475d910e26c4fbb;hb=d8ab9e6c42cb3513a6623df0c2866e1ebbd96485;hp=b80d4160c020e8d7161aaf6b65d55696eb226f59;hpb=d2c0102944176744e440c4109bf7725240453cc7;p=fontconfig.git diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index b80d416..cf4ea6c 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -22,13 +22,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include #ifdef HAVE_CONFIG_H #include #else @@ -38,6 +31,27 @@ #define HAVE_GETOPT 1 #endif +#include "fcint.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined (_WIN32) +#define STRICT +#include +#define sleep(x) Sleep((x) * 1000) +#undef STRICT +#endif + +#ifndef O_BINARY +#define O_BINARY 0 +#endif + #ifndef HAVE_GETOPT #define HAVE_GETOPT 0 #endif @@ -118,23 +132,21 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool { int ret = 0; const FcChar8 *dir; - const FcChar8 *dir_orig; FcFontSet *set; FcStrSet *subdirs; FcStrList *sublist; struct stat statb; + FcBool was_valid; /* * Now scan all of the directories into separate databases * and write out the results */ - while ((dir_orig = FcStrListNext (list))) + while ((dir = FcStrListNext (list))) { - dir = FcConfigNormalizeFontDir (config, dir_orig); - if (verbose) { - printf ("%s: \"%s\": ", program, dir ? dir : dir_orig); + printf ("%s: \"%s\": ", program, dir); fflush (stdout); } @@ -155,14 +167,14 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool set = FcFontSetCreate (); if (!set) { - fprintf (stderr, "Can't create font set\n"); + fprintf (stderr, "%s: Can't create font set\n", dir); ret++; continue; } subdirs = FcStrSetCreate (); if (!subdirs) { - fprintf (stderr, "Can't create directory set\n"); + fprintf (stderr, "%s: Can't create directory set\n", dir); ret++; FcFontSetDestroy (set); continue; @@ -214,15 +226,18 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool if (really_force) FcDirCacheUnlink (dir, config); - if (!FcDirScanConfig (set, subdirs, 0, FcConfigGetBlanks (config), dir, force, config)) + if (!force) + was_valid = FcDirCacheValid (dir, config); + + if (!FcDirScanConfig (set, subdirs, FcConfigGetBlanks (config), dir, force, config)) { - fprintf (stderr, "\"%s\": error scanning\n", dir); + fprintf (stderr, "%s: error scanning\n", dir); FcFontSetDestroy (set); FcStrSetDestroy (subdirs); ret++; continue; } - if (!force && FcDirCacheValid (dir) && FcDirCacheHasCurrentArch (dir)) + if (!force && was_valid) { if (verbose) printf ("skipping, %d fonts, %d dirs\n", @@ -234,15 +249,10 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool printf ("caching, %d fonts, %d dirs\n", set->nfont, nsubdirs (subdirs)); - if (!FcDirCacheValid (dir)) - if (!FcDirCacheUnlink (dir, config)) - ret++; - - if (!FcDirSave (set, subdirs, dir)) + if (!FcDirCacheValid (dir, config)) { - if (!ret) - fprintf (stderr, "Caches are currently saved to \"%s\"\n", PKGCACHEDIR); - fprintf (stderr, "Can't save cache for \"%s\"\n", dir); + fprintf (stderr, "%s: failed to write cache\n", dir); + (void) FcDirCacheUnlink (dir, config); ret++; } } @@ -251,7 +261,7 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool FcStrSetDestroy (subdirs); if (!sublist) { - fprintf (stderr, "Can't create subdir list in \"%s\"\n", dir); + fprintf (stderr, "%s: Can't create subdir list\n", dir); ret++; continue; } @@ -262,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) { @@ -352,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