/*
- * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $
+ * fontconfig/fc-cache/fc-cache.c
*
* Copyright © 2002 Keith Packard
*
* 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 "../fc-arch/fcarch.h"
+#include "../src/fcarch.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
const struct option longopts[] = {
{"force", 0, 0, 'f'},
{"really-force", 0, 0, 'r'},
+ {"root", 1, 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
#endif
static void
-usage (char *program)
+usage (char *program, int error)
{
+ FILE *file = error ? stderr : stdout;
#if HAVE_GETOPT_LONG
- fprintf (stderr, "usage: %s [-frsvV?] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+ fprintf (file, "usage: %s [-frRsvVh] [--force|--really-force] [--root <root>] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
program);
#else
- fprintf (stderr, "usage: %s [-frsvV?] [dirs]\n",
+ fprintf (file, "usage: %s [-frRsvVh] [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, " -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");
+ 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, " -R, --root <root> change to <root> before loading files\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, " -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");
- 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, " -R <root> (root) change to <root> before loading files\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 FcStrSet *processed_dirs;
static int
-scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose)
+scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed)
{
int ret = 0;
const FcChar8 *dir;
continue;
}
- if (stat ((char *) dir, &statb) == -1)
+ if (FcStat (config, dir, &statb) == -1)
{
switch (errno) {
case ENOENT:
if (!cache)
{
+ (*changed)++;
cache = FcDirCacheRead (dir, FcTrue, config);
if (!cache)
{
continue;
}
FcStrSetAdd (processed_dirs, dir);
- ret += scanDirs (sublist, config, force, really_force, verbose);
+ ret += scanDirs (sublist, config, force, really_force, verbose, changed);
}
FcStrListDone (list);
return ret;
{
DIR *d;
struct dirent *ent;
- FcChar8 *dir_base;
+ FcChar8 *fullDir;
+ FcChar8 *checkDir;
FcBool ret = FcTrue;
FcBool remove;
FcCache *cache;
struct stat target_stat;
- dir_base = FcStrPlus (dir, (FcChar8 *) "/");
- if (!dir_base)
- {
- fprintf (stderr, "%s: out of memory\n", dir);
- return FcFalse;
- }
- if (access ((char *) dir, W_OK) != 0)
+ fullDir = FcConfigGetRootPlus (config, dir);
+ if (fullDir)
+ checkDir = fullDir;
+ else
+ checkDir = dir;
+
+ if (access ((char *) checkDir, W_OK) != 0)
{
if (verbose)
printf ("%s: not cleaning %s cache directory\n", dir,
access ((char *) dir, F_OK) == 0 ? "unwritable" : "non-existent");
- FcStrFree (dir_base);
- return FcTrue;
+ goto done;
}
if (verbose)
printf ("%s: cleaning cache directory\n", dir);
- d = opendir ((char *) dir);
+ d = opendir ((char *) checkDir);
if (!d)
{
perror ((char *) dir);
- FcStrFree (dir_base);
- return FcFalse;
+ ret = FcFalse;
+ goto done;
}
while ((ent = readdir (d)))
{
strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX))
continue;
- file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
+ file_name = FcStrPathPlus (dir, (const FcChar8 *) ent->d_name, NULL);
if (!file_name)
{
fprintf (stderr, "%s: allocation failure\n", dir);
break;
}
remove = FcFalse;
- cache = FcDirCacheLoadFile (file_name, NULL);
+ cache = FcDirCacheLoadFile2 (file_name, config, NULL);
if (!cache)
{
if (verbose)
else
{
target_dir = FcCacheDir (cache);
- if (stat ((char *) target_dir, &target_stat) < 0)
+ if (FcStat (config, target_dir, &target_stat) < 0)
{
if (verbose)
printf ("%s: %s: missing directory: %s \n",
}
if (remove)
{
- if (unlink ((char *) file_name) < 0)
+ FcChar8 *unlink_file = FcConfigGetRootPlus (config, file_name);
+ if (!unlink_file)
+ unlink_file = file_name;
+ if (unlink ((char *) unlink_file) < 0)
{
- perror ((char *) file_name);
+ perror ((char *) unlink_file);
ret = FcFalse;
}
+ if (unlink_file != file_name)
+ FcStrFree (unlink_file);
}
FcDirCacheUnload (cache);
FcStrFree (file_name);
}
closedir (d);
- FcStrFree (dir_base);
+ done:
+ if (fullDir)
+ FcStrFree (fullDir);
return ret;
}
FcBool really_force = FcFalse;
FcBool systemOnly = FcFalse;
FcConfig *config;
+ const char *rootDir;
int i;
+ int changed;
int ret;
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
#if HAVE_GETOPT_LONG
- while ((c = getopt_long (argc, argv, "frsVv?", longopts, NULL)) != -1)
+ while ((c = getopt_long (argc, argv, "frR:sVvh", longopts, NULL)) != -1)
#else
- while ((c = getopt (argc, argv, "frsVv?")) != -1)
+ while ((c = getopt (argc, argv, "frR:sVvh")) != -1)
#endif
{
switch (c) {
case 'f':
force = FcTrue;
break;
+ case 'R':
+ rootDir = optarg;
+ break;
case 's':
systemOnly = FcTrue;
break;
case 'v':
verbose = FcTrue;
break;
+ case 'h':
+ usage (argv[0], 0);
default:
- usage (argv[0]);
+ usage (argv[0], 1);
}
}
i = optind;
return 1;
}
FcConfigSetCurrent (config);
+ FcConfigSetRoot (config, (const FcChar8 *) rootDir);
if (argv[i])
{
return 1;
}
- ret = scanDirs (list, config, force, really_force, verbose);
+ changed = 0;
+ ret = scanDirs (list, config, force, really_force, verbose, &changed);
FcStrSetDestroy (processed_dirs);
*/
FcConfigDestroy (config);
FcFini ();
- sleep (2);
+ if (changed)
+ sleep (2);
if (verbose)
printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded");
return ret;
git.wh0rd.org / fontconfig.git / blobdiff