Switch to automake

[fontconfig.git] / fc-list / fc-list.c

diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index 67d712020320fd5c659829a6c0f0c7c33d59a020..f8ca6b2a9733729664c45a6627e158af1ace93d1 100644 (file)
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: $
+ * $XFree86: xc/lib/fontconfig/fc-list/fc-list.c,v 1.5 2002/06/30 23:45:40 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -25,13 +25,25 @@
 #include <fontconfig/fontconfig.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.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[] = {
@@ -47,12 +59,11 @@ extern int optind, opterr, optopt;
 #endif
 #endif
 
-void usage (char *program)
+static void usage (char *program)
 {
-    fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [dirs]\n",
+    fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [pattern] {element ...} \n",
             program);
-    fprintf (stderr, "Build font information caches in [dirs]\n"
-            "(all directories in font configuration by default).\n");
+    fprintf (stderr, "List fonts matching [pattern]\n");
     fprintf (stderr, "\n");
     fprintf (stderr, "  -v, --verbose        display status information while busy\n");
     fprintf (stderr, "  -V, --version        display font config version and exit\n");
@@ -63,11 +74,9 @@ void usage (char *program)
 int
 main (int argc, char **argv)
 {
-    int                ret = 0;
-    FcFontSet  *set;
     int                verbose = 0;
     int                i;
-    FcObjectSet *os = FcObjectSetBuild (FC_FAMILY, FC_LANG, 0);
+    FcObjectSet *os = 0;
     FcFontSet  *fs;
     FcPattern   *pat;
 #if HAVE_GETOPT_LONG || HAVE_GETOPT
@@ -102,10 +111,20 @@ main (int argc, char **argv)
        return 1;
     }
     if (argv[i])
-       pat = FcNameParse (argv[i]);
+    {
+       pat = FcNameParse ((FcChar8 *) argv[i]);
+       while (argv[++i])
+       {
+           if (!os)
+               os = FcObjectSetCreate ();
+           FcObjectSetAdd (os, argv[i]);
+       }
+    }
     else
        pat = FcPatternCreate ();
     
+    if (!os)
+       os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, 0);
     fs = FcFontList (0, pat, os);
     if (pat)
        FcPatternDestroy (pat);
@@ -117,8 +136,11 @@ main (int argc, char **argv)
        for (j = 0; j < fs->nfont; j++)
        {
            FcChar8 *font;
+           FcChar8 *file;
 
            font = FcNameUnparse (fs->fonts[j]);
+           if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch)
+               printf ("%s: ", file);
            printf ("%s\n", font);
            free (font);
        }