Bug 40452 - Running 'fc-match --all' core dumps when no fonts are installed

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

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 48ba6cfe857e6c08900bab5d42d9047c71b2999f..095dd4e21125aef6f373d9239d0ab1a9712c2ad4 100644 (file)
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -175,6 +175,11 @@ main (int argc, char **argv)
        int     j;
        font_patterns = FcFontSort (0, pat, all ? FcFalse : FcTrue, 0, &result);
 
+       if (!font_patterns || font_patterns->nfont == 0)
+       {
+           fputs("No fonts installed on the system\n", stderr);
+           return 1;
+       }
        for (j = 0; j < font_patterns->nfont; j++)
        {
            FcPattern  *font_pattern;
@@ -195,6 +200,14 @@ main (int argc, char **argv)
     }
     FcPatternDestroy (pat);
 
+    if (!format)
+    {
+       if (os)
+           format = "%{=unparse}\n";
+       else
+           format = "%{=fcmatch}\n";
+    }
+
     if (fs)
     {
        int     j;
@@ -209,7 +222,7 @@ main (int argc, char **argv)
            {
                FcPatternPrint (font);
            }
-           else if (format)
+           else
            {
                FcChar8 *s;
 
@@ -220,34 +233,6 @@ main (int argc, char **argv)
                    free (s);
                }
            }
-           else if (os)
-           {
-               FcChar8 *str;
-               str = FcNameUnparse (font);
-               printf ("%s\n", str);
-               free (str);
-           }
-           else
-           {
-               FcChar8 *family;
-               FcChar8 *style;
-               FcChar8 *file;
-
-               if (FcPatternGetString (font, FC_FILE, 0, &file) != FcResultMatch)
-                   file = (FcChar8 *) "<unknown filename>";
-               else
-               {
-                   FcChar8 *slash = (FcChar8 *) strrchr ((char *) file, '/');
-                   if (slash)
-                       file = slash+1;
-               }
-               if (FcPatternGetString (font, FC_FAMILY, 0, &family) != FcResultMatch)
-                   family = (FcChar8 *) "<unknown family>";
-               if (FcPatternGetString (font, FC_STYLE, 0, &style) != FcResultMatch)
-                   style = (FcChar8 *) "<unknown style>";
-
-               printf ("%s: \"%s\" \"%s\"\n", file, family, style);
-           }
 
            FcPatternDestroy (font);
        }