fontconfig: Branch 'master'

 src/fcxml.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ad010e80bdf8e41303e322882ece908f5e04c74
Author: Tom Anderson <[email protected]>
Date:   Wed Apr 11 17:24:43 2018 -0700

    Use realfilename for FcOpen in _FcConfigParse
    
    realfilename is the file name after sysroot adjustments.  It should be used
    instead of filename in the call to FcOpen() which forwards the name directly to
    open().
    
    Though I don't explicitly request a sysroot, I was getting error messages saying
    "failed reading config file".  This CL fixes the error spam.

diff --git a/src/fcxml.c b/src/fcxml.c
index 7c8aaac..aa6612d 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3443,7 +3443,7 @@ _FcConfigParse (FcConfig	*config,
 
     FcStrBufInit (&sbuf, NULL, 0);
 
-    fd = FcOpen ((char *) filename, O_RDONLY);
+    fd = FcOpen ((char *) realfilename, O_RDONLY);
     if (fd == -1)
 	goto bail1;
 
_______________________________________________
Fontconfig mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/fontconfig