Add new command-line utility, fc-cat, to convert fonts.cache-2 files into

    fonts.cache-1 files (e.g. for grepping and validation of the mmap
    codepath), as per James Cloos' request.
Remove done 'TODO' comment.
Updates for development release 2.3.90.

1 files changed, 336 insertions, 0 deletions

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
new file mode 100644
index 00000000..109a0581
--- /dev/null
+++ b/fc-cat/fc-cat.c
@@ -0,0 +1,336 @@
+/*
+ * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $
+ *
+ * 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
+ * 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
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes 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,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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 <fontconfig/fontconfig.h>
+#include <../src/fccache.c>
+#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
+#ifdef linux
+#define HAVE_GETOPT_LONG 1
+#endif
+#define HAVE_GETOPT 1
+#endif
+
+#ifndef HAVE_GETOPT
+#define HAVE_GETOPT 0
+#endif
+#ifndef HAVE_GETOPT_LONG
+#define HAVE_GETOPT_LONG 0
+#endif
+
+#if HAVE_GETOPT_LONG
+#undef  _GNU_SOURCE
+#define _GNU_SOURCE
+#include <getopt.h>
+const struct option longopts[] = {
+    {"version", 0, 0, 'V'},
+    {"help", 0, 0, '?'},
+    {NULL,0,0,0},
+};
+#else
+#if HAVE_GETOPT
+extern char *optarg;
+extern int optind, opterr, optopt;
+#endif
+#endif
+
+/*
+ * POSIX has broken stdio so that getc must do thread-safe locking,
+ * this is a serious performance problem for applications doing large
+ * amounts of IO with getc (as is done here).  If available, use
+ * the getc_unlocked varient instead.
+ */
+ 
+#if defined(getc_unlocked) || defined(_IO_getc_unlocked)
+#define GETC(f) getc_unlocked(f)
+#define PUTC(c,f) putc_unlocked(c,f)
+#else
+#define GETC(f) getc(f)
+#define PUTC(c,f) putc(c,f)
+#endif
+
+static FcBool
+FcCacheWriteChars (FILE *f, const FcChar8 *chars)
+{
+    FcChar8    c;
+    while ((c = *chars++))
+    {
+	switch (c) {
+	case '"':
+	case '\\':
+	    if (PUTC ('\\', f) == EOF)
+		return FcFalse;
+	    /* fall through */
+	default:
+	    if (PUTC (c, f) == EOF)
+		return FcFalse;
+	}
+    }
+    return FcTrue;
+}
+
+static FcBool
+FcCacheWriteUlong (FILE *f, unsigned long t)
+{
+    int	    pow;
+    unsigned long   temp, digit;
+
+    temp = t;
+    pow = 1;
+    while (temp >= 10)
+    {
+	temp /= 10;
+	pow *= 10;
+    }
+    temp = t;
+    while (pow)
+    {
+	digit = temp / pow;
+	if (PUTC ((char) digit + '0', f) == EOF)
+	    return FcFalse;
+	temp = temp - pow * digit;
+	pow = pow / 10;
+    }
+    return FcTrue;
+}
+
+static FcBool
+FcCacheWriteInt (FILE *f, int i)
+{
+    return FcCacheWriteUlong (f, (unsigned long) i);
+}
+
+static FcBool
+FcCacheWriteStringOld (FILE *f, const FcChar8 *string)
+{
+
+    if (PUTC ('"', f) == EOF)
+	return FcFalse;
+    if (!FcCacheWriteChars (f, string))
+	return FcFalse;
+    if (PUTC ('"', f) == EOF)
+	return FcFalse;
+    return FcTrue;
+}
+
+static void
+usage (char *program)
+{
+#if HAVE_GETOPT_LONG
+    fprintf (stderr, "usage: %s [-V?] [--version] [--help] <fonts.cache-2>\n",
+	     program);
+#else
+    fprintf (stderr, "usage: %s [-fsvV?] <fonts.cache-2>\n",
+	     program);
+#endif
+    fprintf (stderr, "Reads font information caches in <fonts.cache-2>\n");
+    fprintf (stderr, "\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");
+#else
+    fprintf (stderr, "  -V         (version) display font config version and exit\n");
+    fprintf (stderr, "  -?         (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 *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, set))
+	goto bail1;
+	
+    close(fd);
+    free (cache_file);
+    return FcTrue;
+
+ bail1:
+    close (fd);
+ bail:
+    free (cache_file);
+    return FcFalse;
+}
+
+/*
+ * return the path from the directory containing 'cache' to 'file'
+ */
+
+static const FcChar8 *
+FcFileBaseName (const char *cache, const FcChar8 *file)
+{
+    const FcChar8   *cache_slash;
+
+    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);
+    return file;
+}
+
+FcBool
+FcCachePrintSet (FcFontSet *set, FcStrSet *dirs, char *cache_file)
+{
+    FcPattern	    *font;
+    FcChar8	    *name, *dir;
+    const FcChar8   *file, *base;
+    int		    n;
+    int		    id;
+    FcBool	    ret;
+    FcStrList	    *list;
+
+    list = FcStrListCreate (dirs);
+    if (!list)
+	goto bail2;
+    
+    while ((dir = FcStrListNext (list)))
+    {
+	base = FcFileBaseName (cache_file, dir);
+	if (!FcCacheWriteStringOld (stdout, base))
+	    goto bail3;
+	if (PUTC (' ', stdout) == EOF)
+	    goto bail3;
+	if (!FcCacheWriteInt (stdout, 0))
+	    goto bail3;
+        if (PUTC (' ', stdout) == EOF)
+	    goto bail3;
+	if (!FcCacheWriteStringOld (stdout, FC_FONT_FILE_DIR))
+	    goto bail3;
+	if (PUTC ('\n', stdout) == EOF)
+	    goto bail3;
+    }
+    
+    for (n = 0; n < set->nfont; n++)
+    {
+	font = set->fonts[n];
+	if (FcPatternGetString (font, FC_FILE, 0, (FcChar8 **) &file) != FcResultMatch)
+	    goto bail3;
+	base = FcFileBaseName (cache_file, 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))
+	    goto bail3;
+	if (PUTC (' ', stdout) == EOF)
+	    goto bail3;
+	if (!FcCacheWriteInt (stdout, id))
+	    goto bail3;
+        if (PUTC (' ', stdout) == EOF)
+	    goto bail3;
+	name = FcNameUnparse (font);
+	if (!name)
+	    goto bail3;
+	ret = FcCacheWriteStringOld (stdout, name);
+	FcStrFree (name);
+	if (!ret)
+	    goto bail3;
+	if (PUTC ('\n', stdout) == EOF)
+	    goto bail3;
+    }
+    
+    FcStrListDone (list);
+
+    return FcTrue;
+    
+bail3:
+    FcStrListDone (list);
+bail2:
+bail1:
+bail0:
+    return FcFalse;
+}
+
+int
+main (int argc, char **argv)
+{
+    int		i;
+    int		ret;
+#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)
+#else
+    while ((c = getopt (argc, argv, "fsVv?")) != -1)
+#endif
+    {
+	switch (c) {
+	case 'V':
+	    fprintf (stderr, "fontconfig version %d.%d.%d\n", 
+		     FC_MAJOR, FC_MINOR, FC_REVISION);
+	    exit (0);
+	default:
+	    usage (argv[0]);
+	}
+    }
+    i = optind;
+#else
+    i = 1;
+#endif
+
+    if (FcCacheFileRead (fs, dirs, argv[i]))
+	FcCachePrintSet (fs, dirs, argv[i]);
+
+    FcStrSetDestroy (dirs);
+    FcFontSetDestroy (fs);
+
+    return 0;
+}