X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=fc-cat%2Ffc-cat.c;h=d9a597cbd8ab9e641a085403e55159ae19e02040;hp=4f5b71d5e13a18b69fac7785d989b9040b8a1df8;hb=9d8d0226d9ac5bc9956263a13454179eafc4ab82;hpb=d6946c1a11695eb55a3fe60db5480df94570b1ba diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c index 4f5b71d..d9a597c 100644 --- a/fc-cat/fc-cat.c +++ b/fc-cat/fc-cat.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $ + * fontconfig/fc-cat/fc-cat.c * * Copyright © 2002 Keith Packard * @@ -13,24 +13,15 @@ * 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 -#include <../src/fccache.c> -#include -#include -#include -#include -#include -#include -#include #ifdef HAVE_CONFIG_H #include #else @@ -40,6 +31,16 @@ #define HAVE_GETOPT 1 #endif +#include +#include "../fc-arch/fcarch.h" +#include +#include +#include +#include +#include +#include +#include + #ifndef HAVE_GETOPT #define HAVE_GETOPT 0 #endif @@ -53,7 +54,9 @@ #include const struct option longopts[] = { {"version", 0, 0, 'V'}, - {"help", 0, 0, '?'}, + {"verbose", 0, 0, 'v'}, + {"recurse", 0, 0, 'r'}, + {"help", 0, 0, 'h'}, {NULL,0,0,0}, }; #else @@ -79,7 +82,7 @@ extern int optind, opterr, optopt; #endif static FcBool -FcCacheWriteChars (FILE *f, const FcChar8 *chars) +write_chars (FILE *f, const FcChar8 *chars) { FcChar8 c; while ((c = *chars++)) @@ -99,7 +102,7 @@ FcCacheWriteChars (FILE *f, const FcChar8 *chars) } static FcBool -FcCacheWriteUlong (FILE *f, unsigned long t) +write_ulong (FILE *f, unsigned long t) { int pow; unsigned long temp, digit; @@ -124,18 +127,18 @@ FcCacheWriteUlong (FILE *f, unsigned long t) } static FcBool -FcCacheWriteInt (FILE *f, int i) +write_int (FILE *f, int i) { - return FcCacheWriteUlong (f, (unsigned long) i); + return write_ulong (f, (unsigned long) i); } static FcBool -FcCacheWriteStringOld (FILE *f, const FcChar8 *string) +write_string (FILE *f, const FcChar8 *string) { if (PUTC ('"', f) == EOF) return FcFalse; - if (!FcCacheWriteChars (f, string)) + if (!write_chars (f, string)) return FcFalse; if (PUTC ('"', f) == EOF) return FcFalse; @@ -143,67 +146,33 @@ FcCacheWriteStringOld (FILE *f, const FcChar8 *string) } static void -usage (char *program) +usage (char *program, int error) { + FILE *file = error ? stderr : stdout; #if HAVE_GETOPT_LONG - fprintf (stderr, "usage: %s [-V?] [--version] [--help] \n", - program); + fprintf (file, "usage: %s [-rv] [--recurse] [--verbose] [*-%s.cache-2|directory]...\n", + program, FC_ARCHITECTURE); + fprintf (file, " %s [-Vh] [--version] [--help]\n", program); #else - fprintf (stderr, "usage: %s [-fsvV?] \n", - program); + fprintf (file, "usage: %s [-rvVh] [*-%s.cache-2|directory]...\n", + program, FC_ARCHITECTURE); #endif - fprintf (stderr, "Reads font information caches in \n"); - fprintf (stderr, "\n"); + fprintf (file, "Reads font information cache from:\n"); + fprintf (file, " 1) specified fontconfig cache file\n"); + fprintf (file, " 2) related to a particular font directory\n"); + fprintf (file, "\n"); #if HAVE_GETOPT_LONG - fprintf (stderr, " -V, --version display font config version and exit\n"); - fprintf (stderr, " -?, --help display this help and exit\n"); + fprintf (file, " -r, --recurse recurse into subdirectories\n"); + fprintf (file, " -v, --verbose be verbose\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, " -V (version) display font config version and exit\n"); - fprintf (stderr, " -? (help) display this help and exit\n"); + fprintf (file, " -r (recurse) recurse into subdirectories\n"); + fprintf (file, " -v (verbose) be verbose\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); -} - -/* read serialized state from the cache file */ -static FcBool -FcCacheFileRead (FcFontSet * set, FcStrSet *dirs, char * dir, char *cache_file) -{ - int fd; - char * current_arch_machine_name; - char candidate_arch_machine_name[9+MACHINE_SIGNATURE_SIZE]; - off_t current_arch_start = 0; - char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1]; - - if (!cache_file) - goto bail; - - current_arch_machine_name = FcCacheMachineSignature(); - fd = open(cache_file, O_RDONLY); - if (fd == -1) - goto bail; - - current_arch_start = FcCacheSkipToArch(fd, current_arch_machine_name); - if (current_arch_start < 0) - goto bail1; - - lseek (fd, current_arch_start, SEEK_SET); - if (FcCacheReadString (fd, candidate_arch_machine_name, - sizeof (candidate_arch_machine_name)) == 0) - goto bail1; - - while (strlen(FcCacheReadString (fd, subdirName, sizeof (subdirName))) > 0) - FcStrSetAdd (dirs, (FcChar8 *)subdirName); - - if (!FcDirCacheConsume (fd, dir, set)) - goto bail1; - - close(fd); - return FcTrue; - - bail1: - close (fd); - bail: - return FcFalse; + exit (error); } /* @@ -211,26 +180,26 @@ FcCacheFileRead (FcFontSet * set, FcStrSet *dirs, char * dir, char *cache_file) */ static const FcChar8 * -FcFileBaseName (const char *cache, const FcChar8 *file) +file_base_name (const FcChar8 *cache, const FcChar8 *file) { - const FcChar8 *cache_slash; + int cache_len = strlen ((char *) cache); - cache_slash = FcStrLastSlash ((const FcChar8 *)cache); - if (cache_slash && !strncmp ((const char *) cache, (const char *) file, - (cache_slash + 1) - (const FcChar8 *)cache)) - return file + ((cache_slash + 1) - (const FcChar8 *)cache); + if (!strncmp ((char *) cache, (char *) file, cache_len) && file[cache_len] == '/') + return file + cache_len + 1; return file; } -FcBool -FcCachePrintSet (FcFontSet *set, FcStrSet *dirs, char *cache_file) +#define FC_FONT_FILE_DIR ((FcChar8 *) ".dir") + +static FcBool +cache_print_set (FcFontSet *set, FcStrSet *dirs, const FcChar8 *base_name, FcBool verbose) { - FcPattern *font; FcChar8 *name, *dir; const FcChar8 *file, *base; + int ret; int n; int id; - FcBool ret; + int ndir = 0; FcStrList *list; list = FcStrListCreate (dirs); @@ -239,49 +208,51 @@ FcCachePrintSet (FcFontSet *set, FcStrSet *dirs, char *cache_file) while ((dir = FcStrListNext (list))) { - base = FcFileBaseName (cache_file, dir); - if (!FcCacheWriteStringOld (stdout, base)) + base = file_base_name (base_name, dir); + if (!write_string (stdout, base)) goto bail3; if (PUTC (' ', stdout) == EOF) goto bail3; - if (!FcCacheWriteInt (stdout, 0)) + if (!write_int (stdout, 0)) goto bail3; if (PUTC (' ', stdout) == EOF) goto bail3; - if (!FcCacheWriteStringOld (stdout, FC_FONT_FILE_DIR)) + if (!write_string (stdout, FC_FONT_FILE_DIR)) goto bail3; if (PUTC ('\n', stdout) == EOF) goto bail3; + ndir++; } for (n = 0; n < set->nfont; n++) { - font = set->fonts[n]; + FcPattern *font = set->fonts[n]; + if (FcPatternGetString (font, FC_FILE, 0, (FcChar8 **) &file) != FcResultMatch) goto bail3; - base = FcFileBaseName (cache_file, file); + base = file_base_name (base_name, file); if (FcPatternGetInteger (font, FC_INDEX, 0, &id) != FcResultMatch) goto bail3; - if (FcDebug () & FC_DBG_CACHEV) - printf (" write file \"%s\"\n", base); - if (!FcCacheWriteStringOld (stdout, base)) + if (!write_string (stdout, base)) goto bail3; if (PUTC (' ', stdout) == EOF) goto bail3; - if (!FcCacheWriteInt (stdout, id)) + if (!write_int (stdout, id)) goto bail3; if (PUTC (' ', stdout) == EOF) goto bail3; name = FcNameUnparse (font); if (!name) goto bail3; - ret = FcCacheWriteStringOld (stdout, name); + ret = write_string (stdout, name); FcStrFree (name); if (!ret) goto bail3; if (PUTC ('\n', stdout) == EOF) goto bail3; } + if (verbose && !set->nfont && !ndir) + printf ("\n"); FcStrListDone (list); @@ -290,8 +261,6 @@ FcCachePrintSet (FcFontSet *set, FcStrSet *dirs, char *cache_file) bail3: FcStrListDone (list); bail2: -bail1: -bail0: return FcFalse; } @@ -299,16 +268,24 @@ int main (int argc, char **argv) { int i; - int ret; + int ret = 0; + FcFontSet *fs; + FcStrSet *dirs; + FcStrSet *args = NULL; + FcStrList *arglist; + FcCache *cache; + FcConfig *config; + FcChar8 *arg; + int verbose = 0; + int recurse = 0; + FcBool first = FcTrue; #if HAVE_GETOPT_LONG || HAVE_GETOPT int c; - FcFontSet *fs = FcFontSetCreate(); - FcStrSet *dirs = FcStrSetCreate(); #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "fsVv?")) != -1) + while ((c = getopt (argc, argv, "Vvrh")) != -1) #endif { switch (c) { @@ -316,8 +293,16 @@ main (int argc, char **argv) fprintf (stderr, "fontconfig version %d.%d.%d\n", FC_MAJOR, FC_MINOR, FC_REVISION); exit (0); + case 'v': + verbose++; + break; + case 'r': + recurse++; + break; + case 'h': + usage (argv[0], 0); default: - usage (argv[0]); + usage (argv[0], 1); } } i = optind; @@ -325,11 +310,100 @@ main (int argc, char **argv) i = 1; #endif - if (FcCacheFileRead (fs, dirs, dirname (strdup(argv[i])), argv[i])) - FcCachePrintSet (fs, dirs, argv[i]); + config = FcInitLoadConfig (); + if (!config) + { + fprintf (stderr, "%s: Can't init font config library\n", argv[0]); + return 1; + } + FcConfigSetCurrent (config); + + args = FcStrSetCreate (); + if (!args) + { + fprintf (stderr, "%s: malloc failure\n", argv[0]); + return 1; + } + if (i < argc) + { + for (; i < argc; i++) + { + if (!FcStrSetAddFilename (args, (const FcChar8 *) argv[i])) + { + fprintf (stderr, "%s: malloc failure\n", argv[0]); + return 1; + } + } + arglist = FcStrListCreate (args); + if (!arglist) + { + fprintf (stderr, "%s: malloc failure\n", argv[0]); + return 1; + } + } + else + { + recurse++; + arglist = FcConfigGetFontDirs (config); + while ((arg = FcStrListNext (arglist))) + if (!FcStrSetAdd (args, arg)) + { + fprintf (stderr, "%s: malloc failure\n", argv[0]); + return 1; + } + FcStrListDone (arglist); + } + arglist = FcStrListCreate (args); + if (!arglist) + { + fprintf (stderr, "%s: malloc failure\n", argv[0]); + return 1; + } - FcStrSetDestroy (dirs); - FcFontSetDestroy (fs); + while ((arg = FcStrListNext (arglist))) + { + int j; + FcChar8 *cache_file = NULL; + struct stat file_stat; + + if (FcFileIsDir (arg)) + cache = FcDirCacheLoad (arg, config, &cache_file); + else + cache = FcDirCacheLoadFile (arg, &file_stat); + if (!cache) + { + perror ((char *) arg); + ret++; + continue; + } + + dirs = FcStrSetCreate (); + fs = FcCacheCopySet (cache); + for (j = 0; j < FcCacheNumSubdir (cache); j++) + { + FcStrSetAdd (dirs, FcCacheSubdir (cache, j)); + if (recurse) + FcStrSetAdd (args, FcCacheSubdir (cache, j)); + } + + if (verbose) + { + if (!first) + printf ("\n"); + printf ("Directory: %s\nCache: %s\n--------\n", + FcCacheDir(cache), cache_file ? cache_file : arg); + first = FcFalse; + } + cache_print_set (fs, dirs, FcCacheDir (cache), verbose); + + FcStrSetDestroy (dirs); + + FcFontSetDestroy (fs); + FcDirCacheUnload (cache); + if (cache_file) + FcStrFree (cache_file); + } + FcFini (); return 0; }