* PERFORMANCE OF THIS SOFTWARE.
*/
-#include <fontconfig/fontconfig.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#else
#define HAVE_GETOPT 1
#endif
+#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
+#include <windows.h>
+#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
#include <getopt.h>
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'},
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"
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");
}
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;
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);
}
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;
FcStrSetDestroy (subdirs);
continue;
}
- if (!FcDirScanConfig (set, subdirs, 0, FcConfigGetBlanks (config), dir, force, config))
+
+ if (really_force)
+ FcDirCacheUnlink (dir, config);
+
+ if (!force)
+ was_valid = FcDirCacheValid (dir);
+
+ 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",
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))
{
- 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++;
}
}
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;
}
FcStrSetAdd (processed_dirs, dir);
- ret += scanDirs (sublist, config, program, force, verbose);
+ ret += scanDirs (sublist, config, program, force, really_force, verbose);
}
FcStrListDone (list);
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)
{
FcStrList *list;
FcBool verbose = FcFalse;
FcBool force = FcFalse;
+ FcBool really_force = FcFalse;
FcBool systemOnly = FcFalse;
FcConfig *config;
int i;
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;
return 1;
}
- ret = scanDirs (list, config, argv[0], force, verbose);
+ ret = scanDirs (list, config, argv[0], force, really_force, verbose);
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
git.wh0rd.org / fontconfig.git / blobdiff