[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcstr.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8890f94438179ed7d6f7e2622178bb6c9b1f0e5e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Oct 9 11:03:03 2012 +0900

    Fix wrongly squashing for the network path on Win32.
    
    Patch from Diego Santa Cruz

diff --git a/src/fcstr.c b/src/fcstr.c
index f505ea6..037960d 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -974,6 +974,10 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s)
     FcMemAlloc (FC_MEM_STRING, size);
     slash = NULL;
     f = file;
+#ifdef _WIN32
+    if (*s == '/' && *(s+1) == '/') /* Network path, do not squash // */
+	*f++ = *s++;
+#endif
     for (;;) {
 	if (*s == '/' || *s == '\0')
 	{