Remove .uuid when no font files exists on a directory

https://bugs.freedesktop.org/show_bug.cgi?id=106632

1 files changed, 22 insertions, 0 deletions

diff --git a/src/fccache.c b/src/fccache.c
index 667d4e7..ada91d1 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -109,6 +109,7 @@ FcDirCacheCreateUUID (FcChar8  *dir,
 	if (!hash_add (config->uuid_table, target, uuid))
 	{
 	    ret = FcFalse;
+	    FcAtomicDeleteNew (atomic);
 	    goto bail3;
 	}
 	uuid_unparse (uuid, out);
@@ -148,6 +149,26 @@ bail1:
     return ret;
 }
 
+FcBool
+FcDirCacheDeleteUUID (const FcChar8  *dir,
+		      FcConfig       *config)
+{
+    const FcChar8 *sysroot = FcConfigGetSysRoot (config);
+    FcChar8 *target;
+    FcBool ret = FcTrue;
+
+    if (sysroot)
+	target = FcStrBuildFilename (sysroot, dir, ".uuid", NULL);
+    else
+	target = FcStrBuildFilename (dir, ".uuid", NULL);
+
+    ret = unlink ((char *) target) == 0;
+    FcStrFree (target);
+    FcHashTableRemove (config->uuid_table, target);
+
+    return ret;
+}
+
 #ifndef _WIN32
 static void
 FcDirCacheReadUUID (FcChar8  *dir,
@@ -325,6 +346,7 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
         if (!cache_hashed)
 	    break;
 	(void) unlink ((char *) cache_hashed);
+	FcDirCacheDeleteUUID (dir, config);
 	FcStrFree (cache_hashed);
     }
     FcStrListDone (list);