From: Patrick Lam <plam@MIT.EDU>
Date: Fri, 14 Oct 2005 20:56:27 +0000 (+0000)
Subject: Check existence of directory cache file before attempting to unlink.
X-Git-Tag: fc-2_3_92~22
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=15d7bd0a16af189194b665e789331a8f8c86f20d;p=fontconfig.git

Check existence of directory cache file before attempting to unlink.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index 2ccc120..bd2585e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-14  Mike Fabian  <mfabian@suse.de>
+        reviewed by: plam
+
+        * src/fccache.c (FcDirCacheUnlink):
+
+        Check existence of directory cache file before attempting to unlink.
+
 2005-10-13  Patrick Lam  <plam@mit.edu>
 	* src/fccache.c (FcDirCacheUnlink):
 
diff --git a/src/fccache.c b/src/fccache.c
index 7ccb529..0bbfffe 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -573,8 +573,10 @@ FcBool
 FcDirCacheUnlink (const FcChar8 *dir)
 {
     FcChar8     *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
+    struct stat	cache_stat;
 
-    if (unlink ((char *)cache_file) != 0)
+    if (stat ((char *) cache_file, &cache_stat) == 0 &&
+	unlink ((char *)cache_file) != 0)
     {
 	FcStrFree (cache_file);
         return FcFalse;