diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:17:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:17:57 +0100 |
| commit | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (patch) | |
| tree | 2a8a059fc83d3f7acc1034071ed3a9f7ff3c0027 /fontconfig/fc-match | |
| parent | 0ae7710db53515dab4a35c33ba9a030bbfc2ac5b (diff) | |
| download | vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.gz vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.bz2 vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.zip | |
fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012
Diffstat (limited to 'fontconfig/fc-match')
| -rw-r--r-- | fontconfig/fc-match/fc-match.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/fontconfig/fc-match/fc-match.c b/fontconfig/fc-match/fc-match.c index e64b4bcdd..4642c8dee 100644 --- a/fontconfig/fc-match/fc-match.c +++ b/fontconfig/fc-match/fc-match.c @@ -98,16 +98,16 @@ usage (char *program, int error) int main (int argc, char **argv) { - int verbose = 0; - int sort = 0, all = 0; - FcChar8 *format = NULL; - int i; - FcObjectSet *os = 0; - FcFontSet *fs; - FcPattern *pat; - FcResult result; + int verbose = 0; + int sort = 0, all = 0; + const FcChar8 *format = NULL; + int i; + FcObjectSet *os = 0; + FcFontSet *fs; + FcPattern *pat; + FcResult result; #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; + int c; #if HAVE_GETOPT_LONG while ((c = getopt_long (argc, argv, "asvf:Vh", longopts, NULL)) != -1) @@ -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; @@ -198,9 +203,9 @@ main (int argc, char **argv) if (!format) { if (os) - format = "%{=unparse}\n"; + format = (const FcChar8 *) "%{=unparse}\n"; else - format = "%{=fcmatch}\n"; + format = (const FcChar8 *) "%{=fcmatch}\n"; } if (fs) |