From: Patrick Lam <plam@MIT.EDU>
Date: Tue, 25 Oct 2005 22:29:13 +0000 (+0000)
Subject: Only add basename to patterns' FC_FILE element, not any part of the
X-Git-Tag: fc-2_3_92~15
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=961d9b9993ae815d6ba723829724bf0685809091;p=fontconfig.git

Only add basename to patterns' FC_FILE element, not any part of the
    dirname.
---

diff --git a/ChangeLog b/ChangeLog
index 095bcb5..3eef5ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-25  Patrick Lam  <plam@mit.edu>
+	* src/fcfreetype.c (FcFreeTypeQuery):
+
+	Only add basename to patterns' FC_FILE element, not any part of
+	the dirname.
+
 2005-10-22  Patrick Lam  <plam@mit.edu>
 	* src/fcfreetype.c:
 
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 20194f1..0a5629c 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <libgen.h>
 #include "fcint.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -1287,7 +1288,7 @@ FcFreeTypeQuery (const FcChar8	*file,
 		printf ("Saving unique fullname %s\n", full);
     }
 
-    if (!FcPatternAddString (pat, FC_FILE, file))
+    if (!FcPatternAddString (pat, FC_FILE, (FcChar8 *)basename((char *)file)))
 	goto bail1;
 
     if (!FcPatternAddInteger (pat, FC_INDEX, id))