/*
- * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $
+ * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $
*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include <getopt.h>
const struct option longopts[] = {
{"force", 0, 0, 'f'},
+ {"system-only", 0, 0, 's'},
{"version", 0, 0, 'V'},
{"verbose", 0, 0, 'v'},
{"help", 0, 0, '?'},
static void
usage (char *program)
{
- fprintf (stderr, "usage: %s [-fvV?] [--force] [--verbose] [--version] [--help] [dirs]\n",
+#if HAVE_GETOPT_LONG
+ fprintf (stderr, "usage: %s [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+ program);
+#else
+ fprintf (stderr, "usage: %s [-fsvV?] [dirs]\n",
program);
+#endif
fprintf (stderr, "Build font information caches in [dirs]\n"
"(all directories in font configuration by default).\n");
fprintf (stderr, "\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");
+#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");
+#endif
exit (1);
}
FcStrList *list;
FcBool verbose = FcFalse;
FcBool force = FcFalse;
+ FcBool systemOnly = FcFalse;
FcConfig *config;
int i;
int ret;
int c;
#if HAVE_GETOPT_LONG
- while ((c = getopt_long (argc, argv, "fVv?", longopts, NULL)) != -1)
+ while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1)
#else
- while ((c = getopt (argc, argv, "fVv?")) != -1)
+ while ((c = getopt (argc, argv, "fsVv?")) != -1)
#endif
{
switch (c) {
case 'f':
force = FcTrue;
break;
+ case 's':
+ systemOnly = FcTrue;
+ break;
case 'V':
fprintf (stderr, "fontconfig version %d.%d.%d\n",
FC_MAJOR, FC_MINOR, FC_REVISION);
i = 1;
#endif
+ if (systemOnly)
+ FcConfigEnableHome (FcFalse);
config = FcInitLoadConfig ();
if (!config)
{
else
list = FcConfigGetConfigDirs (config);
ret = scanDirs (list, config, argv[0], force, 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
+ * then any timestamps we wrote. We don't use gettimeofday() because
+ * sleep(3) can't be interrupted by a signal here -- this isn't in the
+ * library, and there aren't any signals flying around here.
+ */
+ sleep (2);
if (verbose)
printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded");
return ret;