X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-cache%2Ffc-cache.c;h=29974b2ce2b6161032642a7bd574ec13482e35fb;hb=db50cbdaf592349c204ab0af0e7061ea72237044;hp=388baa7651d3386cabf8887eeed3a2168e787952;hpb=303bcf9b9df00ce2906db5c9414aeec96d1a55f9;p=fontconfig.git diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index 388baa7..29974b2 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,21 @@ #define HAVE_GETOPT 1 #endif +#include +#include +#include +#include +#include +#include +#include + +#if defined (_WIN32) +#define STRICT +#include +#define sleep(x) Sleep((x) * 1000) +#undef STRICT +#endif + #ifndef HAVE_GETOPT #define HAVE_GETOPT 0 #endif @@ -51,6 +59,7 @@ #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'}, @@ -68,10 +77,10 @@ static void usage (char *program) { #if HAVE_GETOPT_LONG - fprintf (stderr, "usage: %s [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [dirs]\n", + fprintf (stderr, "usage: %s [-frsvV?] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n", program); #else - fprintf (stderr, "usage: %s [-fsvV?] [dirs]\n", + fprintf (stderr, "usage: %s [-frsvV?] [dirs]\n", program); #endif fprintf (stderr, "Build font information caches in [dirs]\n" @@ -79,12 +88,14 @@ usage (char *program) fprintf (stderr, "\n"); #if HAVE_GETOPT_LONG fprintf (stderr, " -f, --force scan directories with apparently valid caches\n"); + fprintf (stderr, " -r, --really-force erase all existing caches, then rescan\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"); #else fprintf (stderr, " -f (force) scan directories with apparently valid caches\n"); + fprintf (stderr, " -r, (really force) erase all existing caches, then rescan\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"); @@ -93,6 +104,8 @@ usage (char *program) exit (1); } +static FcStrSet *processed_dirs; + static int nsubdirs (FcStrSet *set) { @@ -109,10 +122,10 @@ nsubdirs (FcStrSet *set) } static int -scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose) +scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool really_force, FcBool verbose) { int ret = 0; - FcChar8 *dir; + const FcChar8 *dir; FcFontSet *set; FcStrSet *subdirs; FcStrList *sublist; @@ -129,6 +142,21 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool printf ("%s: \"%s\": ", program, dir); fflush (stdout); } + + if (!dir) + { + if (verbose) + printf ("skipping, no such directory\n"); + continue; + } + + if (FcStrSetMember (processed_dirs, dir)) + { + if (verbose) + printf ("skipping, looped directory detected\n"); + continue; + } + set = FcFontSetCreate (); if (!set) { @@ -152,20 +180,24 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool case ENOTDIR: if (verbose) printf ("skipping, no such directory\n"); - break; + FcFontSetDestroy (set); + FcStrSetDestroy (subdirs); + continue; case EACCES: case EROFS: - if (verbose) - printf ("skipping, no write access\n"); + /* That's ok, caches go to /var anyway. */ + /* Ideally we'd do an access on the hashed_name. */ + /* But we hid that behind an abstraction barrier. */ break; default: fprintf (stderr, "\"%s\": ", dir); perror (""); ret++; + + FcFontSetDestroy (set); + FcStrSetDestroy (subdirs); + continue; } - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); - continue; } if (stat ((char *) dir, &statb) == -1) { @@ -183,7 +215,11 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool FcStrSetDestroy (subdirs); continue; } - if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, force)) + + if (really_force) + FcDirCacheUnlink (dir, config); + + if (!FcDirScanConfig (set, subdirs, 0, FcConfigGetBlanks (config), dir, force, config)) { fprintf (stderr, "\"%s\": error scanning\n", dir); FcFontSetDestroy (set); @@ -191,7 +227,8 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool ret++; continue; } - if (!force && FcDirCacheValid (dir) && FcDirCacheHasCurrentArch (dir)) + if (!force && FcDirCacheValid (dir, config) && + FcDirCacheHasCurrentArch (dir, config)) { if (verbose) printf ("skipping, %d fonts, %d dirs\n", @@ -203,13 +240,15 @@ 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)) + /* This is the only reason we can't combine + * Valid w/HasCurrentArch... */ + if (!FcDirCacheValid (dir, config)) + if (!FcDirCacheUnlink (dir, config)) ret++; if (!FcDirSave (set, subdirs, dir)) { - fprintf (stderr, "Can't save cache in \"%s\"\n", dir); + fprintf (stderr, "Can't save cache for \"%s\"\n", dir); ret++; } } @@ -222,7 +261,8 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool ret++; continue; } - ret += scanDirs (sublist, config, program, force, verbose); + FcStrSetAdd (processed_dirs, dir); + ret += scanDirs (sublist, config, program, force, really_force, verbose); } FcStrListDone (list); return ret; @@ -235,6 +275,7 @@ main (int argc, char **argv) FcStrList *list; FcBool verbose = FcFalse; FcBool force = FcFalse; + FcBool really_force = FcFalse; FcBool systemOnly = FcFalse; FcConfig *config; int i; @@ -243,12 +284,15 @@ main (int argc, char **argv) int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "frsVv?", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "fsVv?")) != -1) + while ((c = getopt (argc, argv, "frsVv?")) != -1) #endif { switch (c) { + case 'r': + really_force = FcTrue; + /* fall through */ case 'f': force = FcTrue; break; @@ -279,6 +323,7 @@ main (int argc, char **argv) fprintf (stderr, "%s: Can't init font config library\n", argv[0]); return 1; } + FcConfigSetCurrent (config); if (argv[i]) { @@ -303,7 +348,16 @@ 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; + } + + ret = scanDirs (list, config, argv[0], force, really_force, verbose); + + FcStrSetDestroy (processed_dirs); + /* * 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