pyrox.dev
1commit 05c6adf8104b4321d3a3716a7b9feb6bf223ed0c (HEAD, nixpkgs)
2Author: Vladimír Čunát <vcunat@gmail.com>
3Date: Tue Nov 4 12:24:25 2014 +0100
4
5 add check for /etc/fonts/@configVersion@/fonts.conf
6
7 It's checked between FONTCONFIG_FILE and the usual /etc/fonts/fonts.conf.
8 Also, hardcode /etc/fonts/fonts.conf to prevent accidental override.
9
10diff --git a/src/fccfg.c b/src/fccfg.c
11index 6377fd7..e9eb10a 100644
12--- a/src/fccfg.c
13+++ b/src/fccfg.c
14@@ -2070,8 +2070,13 @@ FcConfigFilename (const FcChar8 *url)
15 if (!url || !*url)
16 {
17 url = (FcChar8 *) getenv ("FONTCONFIG_FILE");
18+ if (!url) {
19+ static const FcChar8 *cfPath = "/etc/fonts/@configVersion@/fonts.conf";
20+ if (access (cfPath, R_OK) == 0)
21+ url = cfPath;
22+ }
23 if (!url)
24- url = (FcChar8 *) FONTCONFIG_FILE;
25+ url = (FcChar8 *) "/etc/fonts/fonts.conf";
26 }
27 file = 0;
28