/*
- * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.2 2002/02/15 07:36:14 keithp 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 <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
#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");
- fprintf (stderr, " -v, --force scan directories with apparently valid caches\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);
}
}
static int
-scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
+scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose)
{
int ret = 0;
FcChar8 *dir;
FcFontSet *set;
FcStrSet *subdirs;
FcStrList *sublist;
+ struct stat statb;
/*
* Now scan all of the directories into separate databases
ret++;
continue;
}
- if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (0), dir, force))
+
+ if (access ((char *) dir, W_OK) < 0)
{
- fprintf (stderr, "Can't scan \"%s\"\n", dir);
+ switch (errno) {
+ case ENOENT:
+ case ENOTDIR:
+ 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++;
+ }
+ continue;
+ }
+ if (stat ((char *) dir, &statb) == -1)
+ {
+ fprintf (stderr, "\"%s\": ", dir);
+ perror ("");
+ ret++;
+ continue;
+ }
+ if (!S_ISDIR (statb.st_mode))
+ {
+ fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
+ continue;
+ }
+ if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, force))
+ {
+ fprintf (stderr, "\"%s\": error scanning\n", dir);
ret++;
continue;
}
ret++;
continue;
}
- ret += scanDirs (sublist, program, force, verbose);
+ ret += scanDirs (sublist, config, program, force, verbose);
FcStrSetDestroy (subdirs);
}
FcStrListDone (list);
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, argv[0], force, verbose);
+ 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;