X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-cache%2Ffc-cache.c;h=98039f77ff778aaa1fd583bf5e066b42c195b0bf;hb=bb8057ea77ec89e789afbc6e87b7a16d479d3105;hp=6fcf04d444e468356e2db597453e8c10b8a015e0;hpb=df3efc11a9584e2099366c31ba64ac9346760321;p=fontconfig.git diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index 6fcf04d..98039f7 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $ + * fontconfig/fc-cache/fc-cache.c * * Copyright © 2002 Keith Packard * @@ -7,21 +7,32 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in + * documentation, and that the name of the author(s) not be used in * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no + * specific, written prior permission. The authors make no * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include "../src/fcarch.h" + +#ifdef HAVE_CONFIG_H +#include +#else +#ifdef linux +#define HAVE_GETOPT_LONG 1 +#endif +#define HAVE_GETOPT 1 +#endif + #include #include #include @@ -29,13 +40,19 @@ #include #include #include -#ifdef HAVE_CONFIG_H -#include -#else -#ifdef linux -#define HAVE_GETOPT_LONG 1 +#include +#include +#include + +#if defined (_WIN32) +#define STRICT +#include +#define sleep(x) Sleep((x) * 1000) +#undef STRICT #endif -#define HAVE_GETOPT 1 + +#ifndef O_BINARY +#define O_BINARY 0 #endif #ifndef HAVE_GETOPT @@ -51,10 +68,11 @@ #include const struct option longopts[] = { {"force", 0, 0, 'f'}, + {"really-force", 0, 0, 'r'}, {"system-only", 0, 0, 's'}, {"version", 0, 0, 'V'}, {"verbose", 0, 0, 'v'}, - {"help", 0, 0, '?'}, + {"help", 0, 0, 'h'}, {NULL,0,0,0}, }; #else @@ -65,58 +83,50 @@ extern int optind, opterr, optopt; #endif static void -usage (char *program) +usage (char *program, int error) { + FILE *file = error ? stderr : stdout; #if HAVE_GETOPT_LONG - fprintf (stderr, "usage: %s [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [dirs]\n", + fprintf (file, "usage: %s [-frsvVh] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n", program); #else - fprintf (stderr, "usage: %s [-fsvV?] [dirs]\n", + fprintf (file, "usage: %s [-frsvVh] [dirs]\n", program); #endif - fprintf (stderr, "Build font information caches in [dirs]\n" + fprintf (file, "Build font information caches in [dirs]\n" "(all directories in font configuration by default).\n"); - fprintf (stderr, "\n"); + fprintf (file, "\n"); #if HAVE_GETOPT_LONG - fprintf (stderr, " -f, --force scan directories with apparently valid caches\n"); - fprintf (stderr, " -s, --system-only scan system-wide directories only\n"); - fprintf (stderr, " -v, --verbose display status information while busy\n"); - fprintf (stderr, " -V, --version display font config version and exit\n"); - fprintf (stderr, " -?, --help display this help and exit\n"); + fprintf (file, " -f, --force scan directories with apparently valid caches\n"); + fprintf (file, " -r, --really-force erase all existing caches, then rescan\n"); + fprintf (file, " -s, --system-only scan system-wide directories only\n"); + fprintf (file, " -v, --verbose display status information while busy\n"); + fprintf (file, " -V, --version display font config version and exit\n"); + fprintf (file, " -h, --help display this help and exit\n"); #else - fprintf (stderr, " -f (force) scan directories with apparently valid caches\n"); - fprintf (stderr, " -s (system) scan system-wide directories only\n"); - fprintf (stderr, " -v (verbose) display status information while busy\n"); - fprintf (stderr, " -V (version) display font config version and exit\n"); - fprintf (stderr, " -? (help) display this help and exit\n"); + fprintf (file, " -f (force) scan directories with apparently valid caches\n"); + fprintf (file, " -r, (really force) erase all existing caches, then rescan\n"); + fprintf (file, " -s (system) scan system-wide directories only\n"); + fprintf (file, " -v (verbose) display status information while busy\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); #endif - exit (1); + exit (error); } -static int -nsubdirs (FcStrSet *set) -{ - FcStrList *list; - int n = 0; - - list = FcStrListCreate (set); - if (!list) - return 0; - while (FcStrListNext (list)) - n++; - FcStrListDone (list); - return n; -} +static FcStrSet *processed_dirs; static int -scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose) +scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed) { - int ret = 0; - FcChar8 *dir; - FcFontSet *set; - FcStrSet *subdirs; - FcStrList *sublist; - struct stat statb; + int ret = 0; + const FcChar8 *dir; + FcStrSet *subdirs; + FcStrList *sublist; + FcCache *cache; + struct stat statb; + FcBool was_valid; + int i; /* * Now scan all of the directories into separate databases @@ -126,26 +136,25 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool { if (verbose) { - printf ("%s: \"%s\": ", program, dir); + printf ("%s: ", dir); fflush (stdout); } - set = FcFontSetCreate (); - if (!set) + + if (!dir) { - fprintf (stderr, "Can't create font set\n"); - ret++; + if (verbose) + printf ("skipping, no such directory\n"); continue; } - subdirs = FcStrSetCreate (); - if (!subdirs) + + if (FcStrSetMember (processed_dirs, dir)) { - fprintf (stderr, "Can't create directory set\n"); - ret++; - FcFontSetDestroy (set); + if (verbose) + printf ("skipping, looped directory detected\n"); continue; } - - if (access ((char *) dir, W_OK) < 0) + + if (stat ((char *) dir, &statb) == -1) { switch (errno) { case ENOENT: @@ -153,83 +162,193 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool if (verbose) printf ("skipping, no such directory\n"); break; - case EACCES: - case EROFS: - if (verbose) - printf ("skipping, no write access\n"); - break; default: fprintf (stderr, "\"%s\": ", dir); perror (""); ret++; + break; } - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); - continue; - } - if (stat ((char *) dir, &statb) == -1) - { - fprintf (stderr, "\"%s\": ", dir); - perror (""); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); - ret++; continue; } + if (!S_ISDIR (statb.st_mode)) { fprintf (stderr, "\"%s\": not a directory, skipping\n", dir); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); continue; } - if (!FcDirScanConfig (set, subdirs, 0, FcConfigGetBlanks (config), dir, force, config)) + + if (really_force) + FcDirCacheUnlink (dir, config); + + cache = NULL; + was_valid = FcFalse; + if (!force) { + cache = FcDirCacheLoad (dir, config, NULL); + if (cache) + was_valid = FcTrue; + } + + if (!cache) { - fprintf (stderr, "\"%s\": error scanning\n", dir); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); - ret++; - continue; + (*changed)++; + cache = FcDirCacheRead (dir, FcTrue, config); + if (!cache) + { + fprintf (stderr, "%s: error scanning\n", dir); + ret++; + continue; + } } - if (!force && FcDirCacheValid (dir) && FcDirCacheHasCurrentArch (dir)) + + if (was_valid) { if (verbose) - printf ("skipping, %d fonts, %d dirs\n", - set->nfont, nsubdirs(subdirs)); + printf ("skipping, existing cache is valid: %d fonts, %d dirs\n", + FcCacheNumFont (cache), FcCacheNumSubdir (cache)); } else { if (verbose) - printf ("caching, %d fonts, %d dirs\n", - set->nfont, nsubdirs (subdirs)); - - if (!FcDirCacheValid (dir)) - if (!FcDirCacheUnlink (dir)) - ret++; + printf ("caching, new cache contents: %d fonts, %d dirs\n", + FcCacheNumFont (cache), FcCacheNumSubdir (cache)); - if (!FcDirSave (set, subdirs, dir)) + if (!FcDirCacheValid (dir)) { - 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++; } } - FcFontSetDestroy (set); + + subdirs = FcStrSetCreate (); + if (!subdirs) + { + fprintf (stderr, "%s: Can't create subdir set\n", dir); + ret++; + FcDirCacheUnload (cache); + continue; + } + for (i = 0; i < FcCacheNumSubdir (cache); i++) + FcStrSetAdd (subdirs, FcCacheSubdir (cache, i)); + + FcDirCacheUnload (cache); + sublist = FcStrListCreate (subdirs); 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; } - ret += scanDirs (sublist, config, program, force, verbose); + FcStrSetAdd (processed_dirs, dir); + ret += scanDirs (sublist, config, force, really_force, verbose, changed); } FcStrListDone (list); return ret; } +static FcBool +cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose) +{ + DIR *d; + struct dirent *ent; + FcBool ret = FcTrue; + FcBool remove; + FcCache *cache; + struct stat target_stat; + + if (access ((char *) dir, W_OK) != 0) + { + if (verbose) + printf ("%s: not cleaning %s cache directory\n", dir, + access ((char *) dir, F_OK) == 0 ? "unwritable" : "non-existent"); + return FcTrue; + } + if (verbose) + printf ("%s: cleaning cache directory\n", dir); + d = opendir ((char *) dir); + if (!d) + { + perror ((char *) dir); + return FcFalse; + } + while ((ent = readdir (d))) + { + FcChar8 *file_name; + const FcChar8 *target_dir; + + 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 = FcStrPathPlus (dir, (const FcChar8 *) ent->d_name, NULL); + if (!file_name) + { + fprintf (stderr, "%s: allocation failure\n", dir); + ret = FcFalse; + break; + } + remove = FcFalse; + cache = FcDirCacheLoadFile (file_name, NULL); + if (!cache) + { + if (verbose) + printf ("%s: invalid cache file: %s\n", dir, ent->d_name); + remove = FcTrue; + } + else + { + target_dir = FcCacheDir (cache); + if (stat ((char *) target_dir, &target_stat) < 0) + { + if (verbose) + printf ("%s: %s: missing directory: %s \n", + dir, ent->d_name, target_dir); + remove = FcTrue; + } + } + if (remove) + { + if (unlink ((char *) file_name) < 0) + { + perror ((char *) file_name); + ret = FcFalse; + } + } + FcDirCacheUnload (cache); + 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) { @@ -237,20 +356,25 @@ main (int argc, char **argv) FcStrList *list; FcBool verbose = FcFalse; FcBool force = FcFalse; + FcBool really_force = FcFalse; FcBool systemOnly = FcFalse; FcConfig *config; int i; + int changed; int ret; #if HAVE_GETOPT_LONG || HAVE_GETOPT int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "frsVvh", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "fsVv?")) != -1) + while ((c = getopt (argc, argv, "frsVvh")) != -1) #endif { switch (c) { + case 'r': + really_force = FcTrue; + /* fall through */ case 'f': force = FcTrue; break; @@ -264,8 +388,10 @@ main (int argc, char **argv) case 'v': verbose = FcTrue; break; + case 'h': + usage (argv[0], 0); default: - usage (argv[0]); + usage (argv[0], 1); } } i = optind; @@ -294,7 +420,7 @@ main (int argc, char **argv) } while (argv[i]) { - if (!FcStrSetAdd (dirs, (FcChar8 *) argv[i])) + if (!FcStrSetAddFilename (dirs, (FcChar8 *) argv[i])) { fprintf (stderr, "%s: Can't add directory\n", argv[0]); return 1; @@ -306,7 +432,19 @@ main (int argc, char **argv) } else list = FcConfigGetConfigDirs (config); - ret = scanDirs (list, config, argv[0], force, verbose); + + if ((processed_dirs = FcStrSetCreate()) == NULL) { + fprintf(stderr, "Cannot malloc\n"); + return 1; + } + + changed = 0; + ret = scanDirs (list, config, force, really_force, verbose, &changed); + + 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 @@ -315,7 +453,9 @@ main (int argc, char **argv) * library, and there aren't any signals flying around here. */ FcConfigDestroy (config); - sleep (2); + FcFini (); + if (changed) + sleep (2); if (verbose) printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded"); return ret;