Add fc-scan too that runs FcFileScan/FcDirScan

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

diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 2a36bf0447f49cabbdd86a1eb6853ce3406c0f79..8c5672c6a7c04c3aa818f84d69b96ea0b0e0f09e 100644 (file)
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -53,8 +53,9 @@
 #include <getopt.h>
 static const struct option longopts[] = {
     {"index", 1, 0, 'i'},
+    {"format", 1, 0, 'f'},
     {"version", 0, 0, 'V'},
-    {"help", 0, 0, '?'},
+    {"help", 0, 0, 'h'},
     {NULL,0,0,0},
 };
 #else
@@ -64,28 +65,31 @@ extern int optind, opterr, optopt;
 #endif
 #endif
 
-static void usage (char *program)
+static void
+usage (char *program, int error)
 {
+    FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "usage: %s [-V?] [-i index] [--index index] [--version] [--help] font-file...\n",
+    fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] [--index index] [--format FORMAT] [--version] [--help] font-file...\n",
             program);
 #else
-    fprintf (stderr, "usage: %s [-V?] [-i index] font-file...\n",
+    fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] font-file...\n",
             program);
 #endif
-    fprintf (stderr, "Query font files and print resulting pattern(s)\n");
-    fprintf (stderr, "\n");
+    fprintf (file, "Query font files and print resulting pattern(s)\n");
+    fprintf (file, "\n");
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "  -i, --index INDEX    display the INDEX face of each font file only\n");
-    fprintf (stderr, "  -V, --version        display font config version and exit\n");
-    fprintf (stderr, "  -?, --help           display this help and exit\n");
+    fprintf (file, "  -i, --index INDEX    display the INDEX face of each font file only\n");
+    fprintf (file, "  -f, --format=FORMAT  use the given output format\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, "  -i INDEX   (index)   display the INDEX face of each font file only\n");
-    fprintf (stderr, "  -a         (all)     display unpruned sorted list of matches\n");
-    fprintf (stderr, "  -V         (version) display font config version and exit\n");
-    fprintf (stderr, "  -?         (help)    display this help and exit\n");
+    fprintf (file, "  -i INDEX   (index)   display the INDEX face of each font file only\n");
+    fprintf (file, "  -f FORMAT  (format)  use the given output format\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);
 }
 
 int
@@ -93,6 +97,7 @@ main (int argc, char **argv)
 {
     int                index_set = 0;
     int                set_index = 0;
+    FcChar8     *format = NULL;
     int                err = 0;
     int                i;
     FcBlanks    *blanks;
@@ -100,9 +105,9 @@ main (int argc, char **argv)
     int                c;
 
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "i:sVv?", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "i:f:Vh", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "i:asVv?")) != -1)
+    while ((c = getopt (argc, argv, "i:f:Vh")) != -1)
 #endif
     {
        switch (c) {
@@ -110,12 +115,17 @@ main (int argc, char **argv)
            index_set = 1;
            set_index = atoi (optarg);
            break;
+       case 'f':
+           format = (FcChar8 *) strdup (optarg);
+           break;
        case 'V':
            fprintf (stderr, "fontconfig version %d.%d.%d\n",
                     FC_MAJOR, FC_MINOR, FC_REVISION);
            exit (0);
+       case 'h':
+           usage (argv[0], 0);
        default:
-           usage (argv[0]);
+           usage (argv[0], 1);
        }
     }
     i = optind;
@@ -124,7 +134,7 @@ main (int argc, char **argv)
 #endif
 
     if (i == argc)
-       usage (argv[0]);
+       usage (argv[0], 1);
 
     if (!FcInit ())
     {
@@ -147,7 +157,19 @@ main (int argc, char **argv)
            pat = FcFreeTypeQuery ((FcChar8 *) argv[i], index, blanks, &count);
            if (pat)
            {
-               FcPatternPrint (pat);
+               if (format)
+               {
+                   FcChar8 *s;
+
+                   s = FcPatternFormat (pat, format);
+                   printf ("%s", s);
+                   free (s);
+               }
+               else
+               {
+                   FcPatternPrint (pat);
+               }
+
                FcPatternDestroy (pat);
            }
            else