X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffccache.c;h=fd546bd300faf7661f7184c9b8267cdb951fe2ef;hb=d2f786849c0c4503360a5c09469505b05164c6d2;hp=924494f24ee07637fc982d43f912f8a633e3d599;hpb=971cf18018a4f41bca196dd81989e67672e52112;p=fontconfig.git

diff --git a/src/fccache.c b/src/fccache.c
index 924494f..fd546bd 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -23,24 +23,29 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <fcntl.h>
 #include <dirent.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/utsname.h>
 #include <sys/types.h>
-#include <unistd.h>
-#include "fcint.h"
-#include <unistd.h>
+#if defined(HAVE_MMAP) || defined(__CYGWIN__)
+#  include <unistd.h>
+#  include <sys/mman.h>
+#elif defined(_WIN32)
+#  include <windows.h>
+#endif
 
 #define ENDIAN_TEST 0x12345678
-#define MACHINE_SIGNATURE_SIZE 9 + 5*20 + 1
+#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1)
+/* for when we don't have sysconf: */
+#define FC_HARDCODED_PAGESIZE 8192 
 
-static int
-FcDirCacheOpen (const FcChar8 * dir);
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
 
-static char *
-FcDirCacheHashName (char * cache_file, int collisions);
+static int
+FcDirCacheOpen (FcConfig *config, const FcChar8 *dir, FcChar8 **cache_path);
 
 static off_t
 FcCacheSkipToArch (int fd, const char * arch);
@@ -82,68 +87,43 @@ static void MD5Transform(FcChar32 buf[4], FcChar32 in[16]);
 static char *
 FcCacheReadString (int fd, char *dest, int len)
 {
-    FcChar8	c;
-    FcBool	escape;
-    int		size;
-    int		i;
+    int    size;
+    int    slen;
 
     if (len == 0)
 	return 0;
-    
-    size = len;
-    i = 0;
-    escape = FcFalse;
-    while (read (fd, &c, 1) == 1)
+
+    size = read (fd, dest, len-1);
+
+    if (size > 0)
     {
-	if (!escape)
-	{
-	    switch (c) {
-	    case '"':
-		c = '\0';
-		break;
-	    case '\\':
-		escape = FcTrue;
-		continue;
-	    }
-	}
-	if (i == size)
-	{
-	    dest[i++] = 0;
-	    return dest;
-	}
-	dest[i++] = c;
-	if (c == '\0')
-	    return dest;
-	escape = FcFalse;
+	dest[size] = '\0';
+	slen = strlen (dest);
+
+	lseek (fd, slen - size + 1, SEEK_CUR);
+	return slen < len ? dest : 0;
     }
+
     return 0;
 }
 
 static void
 FcCacheSkipString (int fd)
 {
-    FcChar8	c;
-    FcBool	escape;
+    char buf[256];
+    int  size;
+    int  slen;
 
-    escape = FcFalse;
-    while (read (fd, &c, 1) == 1)
+    while ( (size = read (fd, buf, sizeof (buf)-1)) > 0) 
     {
-	if (!escape)
-	{
-	    switch (c) {
-	    case '"':
-		c = '\0';
-		break;
-	    case '\\':
-		escape = FcTrue;
-		continue;
-	    }
-	}
-	if (c == '\0')
-	    return;
-	escape = FcFalse;
+        buf [size] = '\0';
+        slen = strlen (buf);
+        if (slen < size) 
+        {
+            lseek (fd, slen - size + 1, SEEK_CUR);
+            return;
+        }
     }
-    return;
 }
 
 static FcBool
@@ -190,6 +170,8 @@ FcGlobalCacheDestroy (FcGlobalCache *cache)
 	FcGlobalCacheDirDestroy (d);
     }
     FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCache));
+    if (cache->fd != -1)
+	close (cache->fd);
     free (cache);
 }
 
@@ -212,25 +194,27 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
     if (stat ((char *) cache_file, &cache_stat) < 0)
         return;
 
-    cache->fd = open ((char *) cache_file, O_RDONLY);
+    cache->fd = open ((char *) cache_file, O_RDONLY | O_BINARY);
     if (cache->fd == -1)
 	return;
 
     cache->updated = FcFalse;
 
-    FcCacheReadString (cache->fd, name_buf, sizeof (name_buf));
+    if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)))
+        goto bail_and_destroy;
     if (strcmp (name_buf, FC_GLOBAL_MAGIC_COOKIE) != 0)
-	return;
+        goto bail_and_destroy;
 
     current_arch_machine_name = FcCacheMachineSignature ();
     current_arch_start = FcCacheSkipToArch(cache->fd, 
 					   current_arch_machine_name);
     if (current_arch_start < 0)
-        goto bail_and_destroy;
+        goto bail1;
 
     lseek (cache->fd, current_arch_start, SEEK_SET);
-    FcCacheReadString (cache->fd, candidate_arch_machine_name, 
-                       sizeof (candidate_arch_machine_name));
+    if (!FcCacheReadString (cache->fd, candidate_arch_machine_name, 
+			    sizeof (candidate_arch_machine_name)))
+	goto bail_and_destroy;
     if (strlen(candidate_arch_machine_name) == 0)
 	goto bail_and_destroy;
 
@@ -238,8 +222,8 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
     {
 	off_t targ;
 
-	FcCacheReadString (cache->fd, name_buf, sizeof (name_buf));
-	if (!strlen(name_buf))
+	if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)) || 
+	    !strlen(name_buf))
 	    break;
 
 	/* Directory must be older than the global cache file; also
@@ -249,11 +233,28 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
 	    (config_time.set && cache_stat.st_mtime < config_time.time))
         {
             FcCache md;
+	    off_t off;
+
+	    FcStrSetAdd (staleDirs, (FcChar8 *)name_buf);
+
+	    /* skip subdirs */
+	    while (FcCacheReadString (cache->fd, subdirName, 
+				      sizeof (subdirName)) &&
+		   strlen (subdirName))
+		;
 
-            FcStrSetAdd (staleDirs, FcStrCopy ((FcChar8 *)name_buf));
-            read (cache->fd, &md, sizeof (FcCache));
-            lseek (cache->fd, FcCacheNextOffset (lseek(cache->fd, 0, SEEK_CUR)) + md.count, SEEK_SET);
-            continue;
+	    if (read (cache->fd, &md, sizeof (FcCache)) != sizeof(FcCache)) 
+	    {
+		perror ("read metadata");
+		goto bail1;
+	    }
+	    off = FcCacheNextOffset (lseek(cache->fd, 0, SEEK_CUR)) + md.count;
+	    if (lseek (cache->fd, off, SEEK_SET) != off) 
+	    {
+		perror ("lseek");
+		goto bail1;
+	    }
+	    continue;
         }
 
 	d = malloc (sizeof (FcGlobalCacheDir));
@@ -265,12 +266,19 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
 
 	d->name = (char *)FcStrCopy ((FcChar8 *)name_buf);
 	d->ent = 0;
-	d->offset = lseek (cache->fd, 0, SEEK_CUR);
+	d->state = FcGCDirFileRead;
 
 	d->subdirs = FcStrSetCreate();
-	while (strlen(FcCacheReadString (cache->fd, subdirName, sizeof (subdirName))) > 0)
+	do
+	{
+	    if (!FcCacheReadString (cache->fd, subdirName, 
+				    sizeof (subdirName)) ||
+		!strlen (subdirName))
+		break;
 	    FcStrSetAdd (d->subdirs, (FcChar8 *)subdirName);
+	} while (1);
 
+	d->offset = lseek (cache->fd, 0, SEEK_CUR);
 	if (read (cache->fd, &d->metadata, sizeof (FcCache)) != sizeof (FcCache))
 	    goto bail1;
 	targ = FcCacheNextOffset (lseek(cache->fd, 0, SEEK_CUR)) + d->metadata.count;
@@ -305,47 +313,76 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
 FcBool
 FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, const char *dir, FcConfig *config)
 {
-    FcGlobalCacheDir *d;
-    FcBool ret = FcFalse;
+    FcGlobalCacheDir 	*d;
+    int			i;
 
     if (cache->fd == -1)
 	return FcFalse;
 
-    if (!(dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir)))
-	return FcFalse; /* non-existing directory */
+    if (config)
+	if (!(dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir)))
+	    return FcFalse; /* non-existing directory */
 
     for (d = cache->dirs; d; d = d->next)
     {
-	if (strncmp (d->name, dir, strlen(dir)) == 0)
+	if (strcmp (d->name, dir) == 0)
 	{
-	    lseek (cache->fd, d->offset, SEEK_SET);
-	    if (!FcDirCacheConsume (cache->fd, dir, set, config))
+	    if (d->state == FcGCDirDisabled)
 		return FcFalse;
-            if (strcmp (d->name, dir) == 0)
-		ret = FcTrue;
+
+	    if (d->state == FcGCDirFileRead) 
+	    {
+		lseek (cache->fd, d->offset, SEEK_SET);
+		if (!FcDirCacheConsume (cache->fd, d->name, set, config))
+		    return FcFalse;
+
+		for (i = 0; i < d->subdirs->num; i++)
+		    FcStrSetAdd (dirs, (FcChar8 *)d->subdirs->strs[i]);
+
+		d->state = FcGCDirConsumed;
+	    }
+	    return FcTrue;
 	}
     }
 
-    return ret;
+    return FcFalse;
 }
 
+static FcGlobalCacheDir *
+FcGlobalCacheDirFind (FcGlobalCache *cache, const char *name)
+{
+    FcGlobalCacheDir * d;
+
+    if (!cache || !name)
+	return NULL;
+
+    for (d = cache->dirs; d; d = d->next)
+	if (strcmp((const char *)d->name, (const char *)name) == 0)
+	    return d;
+
+    return NULL;
+ }
+
 FcBool
 FcGlobalCacheUpdate (FcGlobalCache  *cache,
 		     FcStrSet	    *dirs,
-		     const char     *name,
+		     const char     *orig_name,
 		     FcFontSet	    *set,
 		     FcConfig	    *config)
 {
     FcGlobalCacheDir    *d;
     int		       	i;
+    const char *name;
 
-    name = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)name);
-    for (d = cache->dirs; d; d = d->next)
+    name = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)orig_name);
+    if (!name) 
     {
-	if (strcmp(d->name, name) == 0)
-	    break;
+	fprintf(stderr, "Invalid directory name %s\n", orig_name);
+	return FcFalse;
     }
 
+    d = FcGlobalCacheDirFind (cache, name);
+
     if (!d)
     {
 	d = malloc (sizeof (FcGlobalCacheDir));
@@ -353,6 +390,11 @@ FcGlobalCacheUpdate (FcGlobalCache  *cache,
 	    return FcFalse;
 	d->next = cache->dirs;
 	cache->dirs = d;
+    } else {
+	/* free old resources */
+	FcStrFree ((FcChar8 *)d->name);
+	free (d->ent);
+	FcStrSetDestroy (d->subdirs);
     }
 
     cache->updated = FcTrue;
@@ -361,6 +403,7 @@ FcGlobalCacheUpdate (FcGlobalCache  *cache,
     d->ent = FcDirCacheProduce (set, &d->metadata);
     d->offset = 0;
     d->subdirs = FcStrSetCreate();
+    d->state = FcGCDirUpdated;
     for (i = 0; i < dirs->num; i++)
 	FcStrSetAdd (d->subdirs, dirs->strs[i]);
     return FcTrue;
@@ -371,7 +414,7 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
 		   const FcChar8    *cache_file,
 		   FcConfig	    *config)
 {
-    int			fd, fd_orig, i;
+    int			fd, fd_orig;
     FcGlobalCacheDir	*dir;
     FcAtomic		*atomic;
     off_t 		current_arch_start = 0, truncate_to;
@@ -392,13 +435,13 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
 
     if (!FcAtomicLock (atomic))
 	goto bail1;
-    fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
+    fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT | O_BINARY, 
 	       S_IRUSR | S_IWUSR);
     if (fd == -1)
 	goto bail2;
     FcCacheWriteString (fd, FC_GLOBAL_MAGIC_COOKIE);
 
-    fd_orig = open ((char *) FcAtomicOrigFile(atomic), O_RDONLY);
+    fd_orig = open ((char *) FcAtomicOrigFile(atomic), O_RDONLY | O_BINARY);
 
     current_arch_machine_name = FcCacheMachineSignature ();
     if (fd_orig == -1)
@@ -418,12 +461,18 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
     if (!FcCacheCopyOld(fd, fd_orig, current_arch_start))
 	goto bail3;
 
-    close (fd_orig);
-    fd_orig = -1;
-
     current_arch_start = lseek(fd, 0, SEEK_CUR);
+#if defined (HAVE_FTRUNCATE)
     if (ftruncate (fd, current_arch_start) == -1)
 	goto bail3;
+#else
+#if defined (HAVE_CHSIZE)
+    if (chsize (fd, current_arch_start) == -1)
+	goto bail3;
+#else
+    goto bail3;
+#endif
+#endif
 
     header = malloc (10 + strlen (current_arch_machine_name));
     if (!header)
@@ -432,6 +481,10 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
     truncate_to = current_arch_start + strlen(current_arch_machine_name) + 11;
     for (dir = cache->dirs; dir; dir = dir->next)
     {
+	int i;
+
+	if (dir->state == FcGCDirDisabled)
+	    continue;
 	truncate_to += strlen(dir->name) + 1;
 	truncate_to += sizeof (FcCache);
 	truncate_to = FcCacheNextOffset (truncate_to);
@@ -448,28 +501,87 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
     if (!FcCacheWriteString (fd, header))
 	goto bail4;
 
+    free (header);
+
     for (dir = cache->dirs; dir; dir = dir->next)
     {
-        if (dir->name)
-        {
-	    const char * d = (const char *)FcConfigNormalizeFontDir (config, (const FcChar8 *)dir->name);
+	int i;
+	const char * d;
+	off_t off;
 
-            FcCacheWriteString (fd, d);
-
-	    for (i = 0; i < dir->subdirs->size; i++)
-		FcCacheWriteString (fd, (char *)dir->subdirs->strs[i]);
-	    FcCacheWriteString (fd, "");
+	if (!dir->name || dir->state == FcGCDirDisabled)
+	    continue;
+	d = (const char *)FcConfigNormalizeFontDir (config, (const FcChar8 *)dir->name);
+	if (!d) 
+	    continue;
 	    
-            write (fd, &dir->metadata, sizeof(FcCache));
-            lseek (fd, FcCacheNextOffset (lseek(fd, 0, SEEK_CUR)), SEEK_SET);
-            write (fd, dir->ent, dir->metadata.count);
-            free (dir->ent);
-        }
+	if (dir->metadata.count && !dir->ent) 
+	{
+	    if (dir->state == FcGCDirUpdated || fd_orig < 0) 
+	    {
+		fprintf(stderr, "Invalid metadata entry for %s, skipping...\n", d);
+		continue;
+	    }
+	    /* copy the old content */
+	    dir->ent = malloc (dir->metadata.count);
+	    if (!dir->ent) 
+	    {
+		perror("malloc error");
+		continue;
+	    }
+	    off = FcCacheNextOffset (dir->offset + sizeof(FcCache));
+	    if (lseek (fd_orig, off, SEEK_SET) != off) 
+	    {
+		perror("lseek");
+		free(dir->ent);
+		continue;
+	    }
+	    if (read (fd_orig, dir->ent, dir->metadata.count)
+		!= dir->metadata.count) 
+	    {
+		perror("read");
+		free(dir->ent);
+		continue;
+	    }
+	}
+	
+	FcCacheWriteString (fd, d);
+
+	for (i = 0; i < dir->subdirs->size; i++)
+	    FcCacheWriteString (fd, (char *)dir->subdirs->strs[i]);
+	FcCacheWriteString (fd, "");
+	
+	if (write (fd, &dir->metadata, sizeof(FcCache)) != sizeof(FcCache))
+	{
+	    perror ("write metadata");
+	    free (dir->ent);
+	    continue;
+	}
+	off = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR));
+	if (lseek (fd, off, SEEK_SET) != off)
+	{
+	    perror ("lseek");
+	    free (dir->ent);
+	    continue;
+	}
+	if (dir->metadata.count)
+	{
+	    if (write (fd, dir->ent, dir->metadata.count) != dir->metadata.count)
+	    {
+		perror ("write dirent");
+		free (dir->ent);
+		continue;
+	    }
+	}
+	free (dir->ent);
     }
     FcCacheWriteString (fd, "");
 
     if (close (fd) == -1)
 	goto bail25;
+
+    close (fd_orig);
+    fd_orig = -1;
     
     if (!FcAtomicReplaceOrig (atomic))
 	goto bail25;
@@ -504,8 +616,16 @@ static int
 FcCacheNextOffset(off_t w)
 {
     static long pagesize = -1;
+
+    if (w == -1)
+        return w;
+
     if (pagesize == -1)
+#if defined (HAVE_SYSCONF)
 	pagesize = sysconf(_SC_PAGESIZE);
+#else
+	pagesize = FC_HARDCODED_PAGESIZE;
+#endif
     if (w % pagesize == 0) 
 	return w;
     else
@@ -540,7 +660,7 @@ FcCacheSkipToArch (int fd, const char * arch)
 	    return -1;
 	bs = strtol(candidate_arch_machine_name_count, &candidate_arch, 16);
 
-	// count = 0 should probably be distinguished from the !bs condition
+	/* count = 0 should probably be distinguished from the !bs condition */
 	if (!bs || bs < strlen (candidate_arch_machine_name_count))
 	    return -1;
 
@@ -549,9 +669,8 @@ FcCacheSkipToArch (int fd, const char * arch)
 	if (strcmp (candidate_arch, arch)==0)
 	    return current_arch_start;
 	current_arch_start += bs;
+	current_arch_start = FcCacheNextOffset (current_arch_start);
     }
-
-    return -1;
 }
 
 /* Cuts out the segment at the file pointer (moves everything else
@@ -571,6 +690,7 @@ FcCacheCopyOld (int fd, int fd_orig, off_t start)
 
     loc = 0;
     lseek (fd, 0, SEEK_SET); lseek (fd_orig, 0, SEEK_SET);
+    FcCacheSkipString (fd); FcCacheSkipString (fd_orig);
     do
     {
         int b = 8192;
@@ -621,56 +741,55 @@ FcCacheCopyOld (int fd, int fd_orig, off_t start)
 }
 
 /* Does not check that the cache has the appropriate arch section. */
-/* Also, this can be fooled if the original location has a stale
- * cache, and the hashed location has an up-to-date cache.  Oh well,
- * sucks to be you in that case! */
 FcBool
-FcDirCacheValid (const FcChar8 *dir)
+FcDirCacheValid (const FcChar8 *dir, FcConfig *config)
 {
-    struct stat file_stat, dir_stat;
     int 	fd;
 
-    if (stat ((char *) dir, &dir_stat) < 0)
-        return FcFalse;
-
-    fd = FcDirCacheOpen (dir);
+    fd = FcDirCacheOpen (config, dir, NULL);
 
     if (fd < 0)
-	goto bail;
-    if (fstat (fd, &file_stat) < 0)
-	goto bail;
-
+	return FcFalse;
     close (fd);
 
-    /*
-     * If the directory has been modified more recently than
-     * the cache file, the cache is not valid
-     */
-    if (dir_stat.st_mtime > file_stat.st_mtime)
-        return FcFalse;
-
     return FcTrue;
-
- bail:
-    close (fd);
-    return FcFalse;
 }
 
 /* Assumes that the cache file in 'dir' exists.
  * Checks that the cache has the appropriate arch section. */
 FcBool
-FcDirCacheHasCurrentArch (const FcChar8 *dir)
+FcDirCacheHasCurrentArch (const FcChar8 *dir, FcConfig *config)
 {
     int 	fd;
     off_t	current_arch_start;
     char 	*current_arch_machine_name;
+    FcCache	metadata;
+    char 	subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1];
 
-    fd = FcDirCacheOpen (dir);
+    fd = FcDirCacheOpen (config, dir, NULL);
     if (fd < 0)
 	goto bail;
 
     current_arch_machine_name = FcCacheMachineSignature();
     current_arch_start = FcCacheSkipToArch(fd, current_arch_machine_name);
+
+    if (current_arch_start >= 0)
+    {
+	if (lseek (fd, current_arch_start, SEEK_SET) != current_arch_start)
+	    goto bail1;
+
+	FcCacheSkipString (fd);
+
+	while (FcCacheReadString (fd, subdirName, sizeof (subdirName)) && strlen (subdirName) > 0)
+	    ;
+
+        if (read(fd, &metadata, sizeof(FcCache)) != sizeof(FcCache))
+	    goto bail1;
+
+        if (metadata.magic != FC_CACHE_MAGIC)
+	    goto bail1;
+    }
+
     close (fd);
 
     if (current_arch_start < 0)
@@ -678,85 +797,99 @@ FcDirCacheHasCurrentArch (const FcChar8 *dir)
     
     return FcTrue;
 
+ bail1:
+    close (fd);
  bail:
     return FcFalse;
 }
 
-FcBool
-FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
+#define CACHEBASE_LEN (1 + 32 + sizeof (FC_CACHE_SUFFIX))
+
+static const char bin2hex[] = { '0', '1', '2', '3',
+				'4', '5', '6', '7',
+				'8', '9', 'a', 'b',
+				'c', 'd', 'e', 'f' };
+
+static FcChar8 *
+FcDirCacheBasename (const FcChar8 * dir, FcChar8 cache_base[CACHEBASE_LEN])
 {
-    char	*cache_file;
-    char	*cache_hashed = 0;
-    int		fd, collisions;
-    struct stat	cache_stat;
-    char	name_buf[FC_MAX_FILE_LEN];
+    unsigned char 	hash[16];
+    FcChar8		*hex_hash;
+    int			cnt;
+    struct MD5Context 	ctx;
 
-    dir = FcConfigNormalizeFontDir (config, dir);
-    cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
-    if (!cache_file)
-	return FcFalse;
+    MD5Init (&ctx);
+    MD5Update (&ctx, (unsigned char *)dir, strlen ((char *) dir));
 
-    /* First remove normal cache file. */
-    if (stat ((char *) cache_file, &cache_stat) == 0 &&
-	unlink ((char *)cache_file) != 0)
-	goto bail;
+    MD5Final (hash, &ctx);
 
-    /* Next remove any applicable hashed files. */
-    fd = -1; collisions = 0;
-    do
+    cache_base[0] = '/';
+    hex_hash = cache_base + 1;
+    for (cnt = 0; cnt < 16; ++cnt)
     {
-	if (cache_hashed)
-	    FcStrFree ((FcChar8 *)cache_hashed);
+	hex_hash[2*cnt  ] = bin2hex[hash[cnt] >> 4];
+	hex_hash[2*cnt+1] = bin2hex[hash[cnt] & 0xf];
+    }
+    hex_hash[2*cnt] = 0;
+    strcat ((char *) cache_base, FC_CACHE_SUFFIX);
 
-	cache_hashed = FcDirCacheHashName (cache_file, collisions++);
-	if (!cache_hashed)
-	    goto bail;
+    return cache_base;
+}
 
-	if (fd > 0)
-	    close (fd);
-	fd = open(cache_hashed, O_RDONLY);
-	if (fd == -1)
-	{
-	    FcStrFree ((FcChar8 *)cache_file);
-	    return FcTrue;
-	}
+FcBool
+FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
+{
+    int		fd = -1;
+    FcChar8	*cache_hashed = NULL;
+    FcChar8	cache_base[CACHEBASE_LEN];
+    FcStrList	*list;
+    FcChar8	*cache_dir;
+    char	dir_buf[FC_MAX_FILE_LEN];
 
-	FcCacheReadString (fd, name_buf, sizeof (name_buf));
-	if (!strlen(name_buf))
-	{
-	    FcStrFree ((FcChar8 *)cache_hashed);
-	    goto bail;
-	}
-    } while (strcmp (name_buf, cache_file) != 0);
+    dir = FcConfigNormalizeFontDir (config, dir);
 
-    FcStrFree ((FcChar8 *)cache_file);
-    close (fd);
+    FcDirCacheBasename (dir, cache_base);
 
-    if (stat ((char *) cache_hashed, &cache_stat) == 0 &&
-	unlink ((char *)cache_hashed) != 0)
+    list = FcStrListCreate (config->cacheDirs);
+    if (!list)
+        return FcFalse;
+	
+    while ((cache_dir = FcStrListNext (list)))
     {
-	FcStrFree ((FcChar8 *)cache_hashed);
-	goto bail;
+        cache_hashed = FcStrPlus (cache_dir, cache_base);
+        if (!cache_hashed)
+	    break;
+        fd = open((char *) cache_hashed, O_RDONLY | O_BINARY);
+    	FcStrFree (cache_hashed);
+        if (fd >= 0) 
+	{
+	    if (FcCacheReadString (fd, dir_buf, sizeof (dir_buf)) &&
+		strcmp (dir_buf, (char *) dir) == 0)
+	    {
+		close (fd);
+		if (unlink ((char *) cache_hashed) < 0)
+		    break;
+	    } else
+		close (fd);
+	}
     }
-
-    FcStrFree ((FcChar8 *)cache_hashed);
+    FcStrListDone (list);
+    /* return FcFalse if something went wrong */
+    if (cache_dir)
+	return FcFalse;
     return FcTrue;
-
- bail:
-    FcStrFree ((FcChar8 *)cache_file);
-    return FcFalse;
 }
 
 static int
 FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache, 
-		 FcStrList *list, FcFontSet * set)
+		 FcStrList *list, FcFontSet * set, FcStrSet *processed_dirs)
 {
     int			ret = 0;
     FcChar8		*dir;
-    FcChar8		*file, *base;
     FcStrSet		*subdirs;
     FcStrList		*sublist;
     struct stat		statb;
+    FcGlobalCacheDir   *d;
 
     /*
      * Read in the results from 'list'.
@@ -766,21 +899,24 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache,
 	if (!FcConfigAcceptFilename (config, dir))
 	    continue;
 
-	/* freed below */
-	file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
-	if (!file)
-	    return FcFalse;
+	/* Skip this directory if already updated
+	 * to avoid the looped directories via symlinks
+	 * Clearly a dir not in fonts.conf shouldn't be globally cached.
+	 */
+	dir = (FcChar8 *)FcConfigNormalizeFontDir (config, dir);
+	if (!dir)
+	    continue;
 
-	strcpy ((char *) file, (char *) dir);
-	strcat ((char *) file, "/");
-	base = file + strlen ((char *) file);
+	if (FcStrSetMember (processed_dirs, dir))
+	    continue;
+	if (!FcStrSetAdd (processed_dirs, dir))
+	    continue;
 
 	subdirs = FcStrSetCreate ();
 	if (!subdirs)
 	{
 	    fprintf (stderr, "Can't create directory set\n");
 	    ret++;
-	    free (file);
 	    continue;
 	}
 	
@@ -797,7 +933,6 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache,
 		ret++;
 	    }
 	    FcStrSetDestroy (subdirs);
-	    free (file);
 	    continue;
 	}
 	if (stat ((char *) dir, &statb) == -1)
@@ -806,17 +941,25 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache,
 	    perror ("");
 	    FcStrSetDestroy (subdirs);
 	    ret++;
-	    free (file);
 	    continue;
 	}
 	if (!S_ISDIR (statb.st_mode))
 	{
 	    fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
 	    FcStrSetDestroy (subdirs);
-	    free (file);
 	    continue;
 	}
-	if (!FcDirCacheValid (dir) || !FcDirCacheRead (set, subdirs, dir, config))
+	if (FcDirCacheRead (set, subdirs, dir, config))
+	{
+	    /* if an old entry is found in the global cache, disable it */
+	    if ((d = FcGlobalCacheDirFind (cache, (const char *)dir)) != NULL)
+	    {
+		d->state = FcGCDirDisabled;
+		/* save the updated config later without this entry */
+		cache->updated = FcTrue;
+	    }
+	}
+	else
 	{
 	    if (FcDebug () & FC_DBG_FONTSET)
 		printf ("cache scan dir %s\n", dir);
@@ -830,11 +973,9 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache,
 	{
 	    fprintf (stderr, "Can't create subdir list in \"%s\"\n", dir);
 	    ret++;
-	    free (file);
 	    continue;
 	}
-	ret += FcCacheReadDirs (config, cache, sublist, set);
-	free (file);
+	ret += FcCacheReadDirs (config, cache, sublist, set, processed_dirs);
     }
     FcStrListDone (list);
     return ret;
@@ -843,126 +984,90 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache,
 FcFontSet *
 FcCacheRead (FcConfig *config, FcGlobalCache * cache)
 {
-    FcFontSet * s = FcFontSetCreate();
+    FcFontSet 	*s = FcFontSetCreate();
+    FcStrSet 	*processed_dirs;
+
     if (!s) 
 	return 0;
 
-    if (FcCacheReadDirs (config, cache, FcConfigGetConfigDirs (config), s))
+    processed_dirs = FcStrSetCreate();
+    if (!processed_dirs)
 	goto bail;
 
+    if (FcCacheReadDirs (config, cache, FcConfigGetConfigDirs (config), s, processed_dirs))
+	goto bail1;
+
+    FcStrSetDestroy (processed_dirs);
     return s;
 
+ bail1:
+    FcStrSetDestroy (processed_dirs);
  bail:
     FcFontSetDestroy (s);
     return 0;
 }
 
-static const char bin2hex[] = { '0', '1', '2', '3',
-				'4', '5', '6', '7',
-				'8', '9', 'a', 'b',
-				'c', 'd', 'e', 'f' };
-
-static char *
-FcDirCacheHashName (char * cache_file, int collisions)
+/* Opens the cache file for 'dir' for reading.
+ * This searches the list of cache dirs for the relevant cache file,
+ * returning the first one found.
+ */
+static int
+FcDirCacheOpen (FcConfig *config, const FcChar8 *dir, FcChar8 **cache_path)
 {
-    unsigned char 	hash[16], hex_hash[33];
-    char 		*cache_hashed;
-    unsigned char	uscore = '_';
-    int			cnt, i;
-    FcChar8 		*tmp;
-    struct MD5Context 	ctx;
-
-    MD5Init (&ctx);
-    MD5Update (&ctx, (unsigned char *)cache_file, strlen (cache_file));
+    int		fd = -1;
+    FcChar8	*cache_hashed = NULL;
+    FcChar8	cache_base[CACHEBASE_LEN];
+    FcStrList	*list;
+    FcChar8	*cache_dir;
+    char	dir_buf[FC_MAX_FILE_LEN];
+    struct stat file_stat, dir_stat;
 
-    for (i = 0; i < collisions; i++)
-	MD5Update (&ctx, &uscore, 1);
+    if (stat ((char *) dir, &dir_stat) < 0)
+        return -1;
 
-    MD5Final (hash, &ctx);
+    FcDirCacheBasename (dir, cache_base);
 
-    for (cnt = 0; cnt < 16; ++cnt)
+    list = FcStrListCreate (config->cacheDirs);
+    if (!list)
+        return -1;
+	
+    while ((cache_dir = FcStrListNext (list)))
     {
-	hex_hash[2*cnt] = bin2hex[hash[cnt] >> 4];
-	hex_hash[2*cnt+1] = bin2hex[hash[cnt] & 0xf];
+        cache_hashed = FcStrPlus (cache_dir, cache_base);
+        if (!cache_hashed)
+	    break;
+        fd = open((char *) cache_hashed, O_RDONLY | O_BINARY);
+        if (fd >= 0) {
+	    if (fstat (fd, &file_stat) >= 0 &&
+		dir_stat.st_mtime <= file_stat.st_mtime)
+	    {
+		break;
+	    }
+	    close (fd);
+	    fd = -1;
+	}
+	FcStrFree (cache_hashed);
+	cache_hashed = NULL;
     }
-    hex_hash[32] = 0;
-
-    tmp = FcStrPlus ((FcChar8 *)hex_hash, (FcChar8 *)FC_CACHE_SUFFIX);
-    if (!tmp)
-	return 0;
-
-    cache_hashed = (char *)FcStrPlus ((FcChar8 *)PKGCACHEDIR"/", tmp);
-    free (tmp);
-
-    return cache_hashed;
-}
-
-/* Opens the hashed name for cache_file.
- * This would fail in the unlikely event of a collision and subsequent
- * removal of the file which originally caused the collision. */
-static int
-FcDirCacheOpen (const FcChar8 *dir)
-{
-    FcBool	found;
-    int		fd = -1, collisions = 0;
-    char	*cache_file, *cache_hashed;
-    char	name_buf[FC_MAX_FILE_LEN];
-    struct stat dir_stat;
-
-    cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
-    if (!cache_file)
-	return -1;
-
-    fd = open(cache_file, O_RDONLY);
-    if (fd != -1)
-	return fd;
+    FcStrListDone (list);
 
-    if (stat ((char *)dir, &dir_stat) == -1)
+    if (fd < 0)
 	return -1;
-
-    found = FcFalse;
-    do
+    
+    if (!FcCacheReadString (fd, dir_buf, sizeof (dir_buf)) ||
+	strcmp (dir_buf, (char *) dir) != 0)
     {
-	struct stat c;
-	FcChar8 * name_buf_dir;
-
-	cache_hashed = FcDirCacheHashName (cache_file, collisions++);
-	if (!cache_hashed)
-	{
-	    FcStrFree ((FcChar8 *)cache_file);
-	    return -1;
-	}
-
-	if (fd > 0)
-	    close (fd);
-	fd = open(cache_hashed, O_RDONLY);
-	FcStrFree ((FcChar8 *)cache_hashed);
-
-	if (fd == -1)
-	{
-	    FcStrFree ((FcChar8 *)cache_file);
-	    return -1;
-	}
-	FcCacheReadString (fd, name_buf, sizeof (name_buf));
-	if (!strlen(name_buf))
-	    goto bail;
+    	close (fd);
+        FcStrFree (cache_hashed);
+        return -1;
+    }
+    
+    if (cache_path)
+	*cache_path = cache_hashed;
+    else
+	FcStrFree (cache_hashed);
 
-	name_buf_dir = FcStrDirname ((FcChar8 *)name_buf);
-	if (stat ((char *)name_buf_dir, &c) == -1)
-	{
-	    FcStrFree (name_buf_dir);
-	    continue;
-	}
-	FcStrFree (name_buf_dir);
-	found = (c.st_ino == dir_stat.st_ino) && (c.st_dev == dir_stat.st_dev);
-    } while (!found);
-    FcStrFree ((FcChar8 *)cache_file);
     return fd;
-
- bail:
-    FcStrFree ((FcChar8 *)cache_file);
-    close (fd);
-    return -1;
 }
 
 /* read serialized state from the cache file */
@@ -975,7 +1080,7 @@ FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *
     off_t 	current_arch_start = 0;
     char 	subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1];
 
-    fd = FcDirCacheOpen (dir);
+    fd = FcDirCacheOpen (config, dir, NULL);
     if (fd < 0)
 	goto bail;
 
@@ -990,7 +1095,7 @@ FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *
 			   sizeof (candidate_arch_machine_name)) == 0)
 	goto bail1;
 
-    while (strlen(FcCacheReadString (fd, subdirName, sizeof (subdirName))) > 0)
+    while (FcCacheReadString (fd, subdirName, sizeof (subdirName)) && strlen (subdirName) > 0)
         FcStrSetAdd (dirs, (FcChar8 *)subdirName);
 
     if (!FcDirCacheConsume (fd, (const char *)dir, set, config))
@@ -1010,9 +1115,10 @@ FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config)
 {
     FcCache metadata;
     void * current_dir_block;
-    off_t pos;
+    off_t pos, endpos;
 
-    read(fd, &metadata, sizeof(FcCache));
+    if (read(fd, &metadata, sizeof(FcCache)) != sizeof(FcCache))
+	return FcFalse;
     if (metadata.magic != FC_CACHE_MAGIC)
         return FcFalse;
 
@@ -1026,20 +1132,65 @@ FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config)
     }
 
     pos = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR));
+
+    /* This is not failsafe (multi-arches can break it),
+     * but fd has got to have at least as many bytes as
+     * metadata.count, or something's going to go horribly wrong. */
+    if (pos == (off_t)-1)
+        return FcFalse;
+
+    endpos = lseek (fd, 0, SEEK_END);
+    if (endpos == (off_t)-1 || endpos - pos < metadata.count)
+        return FcFalse;
+    if (lseek (fd, pos, SEEK_SET) == -1)
+        return FcFalse;
+
+#if defined(HAVE_MMAP) || defined(__CYGWIN__)
     current_dir_block = mmap (0, metadata.count, 
 			      PROT_READ, MAP_SHARED, fd, pos);
-    lseek (fd, pos+metadata.count, SEEK_SET);
     if (current_dir_block == MAP_FAILED)
 	return FcFalse;
+#elif defined(_WIN32)
+	{
+		HANDLE hFileMap;
+
+		hFileMap = CreateFileMapping((HANDLE) _get_osfhandle(fd), NULL, PAGE_READONLY, 0, 0, NULL);
+		if (hFileMap == NULL)
+			return FcFalse;
+
+		current_dir_block = MapViewOfFile (hFileMap, FILE_MAP_READ, 0, 0, metadata.count + pos);
+		if (current_dir_block == NULL)
+		{
+			CloseHandle (hFileMap);
+			return FcFalse;
+		}
+
+		current_dir_block = (void *)((char *)current_dir_block + pos);
+	}
+#else
+    current_dir_block = malloc (metadata.count);
+    if (!current_dir_block)
+	return FcFalse;
+
+    /* could also use CreateMappedViewOfFile under MinGW... */
+    if (read (fd, current_dir_block, metadata.count) != metadata.count)
+	goto bail;
+#endif
+    lseek (fd, pos+metadata.count, SEEK_SET);
 
     FcCacheAddBankDir (metadata.bank, dir);
     if (config)
 	FcConfigAddFontDir (config, (FcChar8 *)dir);
 
     if (!FcFontSetUnserialize (&metadata, set, current_dir_block))
-	return FcFalse;
+	goto bail;
 
     return FcTrue;
+ bail:
+#if !(defined(HAVE_MMAP) || defined(__CYGWIN__))
+    free (current_dir_block);
+#endif
+    return FcFalse;
 }
 
 static void *
@@ -1049,12 +1200,24 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata)
     static unsigned int rand_state = 0;
     int bank, needed_bytes_no_align;
 
+#if defined (HAVE_RAND_R)
     if (!rand_state) 
 	rand_state = time(0L);
     bank = rand_r(&rand_state);
 
     while (FcCacheHaveBank(bank))
 	bank = rand_r(&rand_state);
+#else
+    if (!rand_state)
+    {
+        rand_state = 1;
+        srand (time (0L));
+    }
+    bank = rand();
+
+    while (FcCacheHaveBank(bank))
+        bank = rand();
+#endif
 
     memset (metadata, 0, sizeof(FcCache));
     FcFontSetNewBank();
@@ -1074,7 +1237,7 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata)
     current_dir_block = malloc (metadata->count);
     if (!current_dir_block)
 	goto bail;
-    // shut up valgrind
+    /* shut up valgrind */
     memset (current_dir_block, 0, metadata->count);
     final_dir_block = FcFontSetDistributeBytes (metadata, current_dir_block);
 
@@ -1091,54 +1254,82 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata)
     return 0;
 }
 
+static FcBool
+FcMakeDirectory (const FcChar8 *dir)
+{
+    FcChar8 *parent;
+    FcBool  ret;
+    
+    if (strlen ((char *) dir) == 0)
+	return FcFalse;
+    
+    parent = FcStrDirname (dir);
+    if (!parent)
+	return FcFalse;
+    if (access ((char *) parent, W_OK|X_OK) == 0)
+	ret = mkdir ((char *) dir, 0777) == 0;
+    else if (access ((char *) parent, F_OK) == -1)
+	ret = FcMakeDirectory (parent) && (mkdir ((char *) dir, 0777) == 0);
+    else
+	ret = FcFalse;
+    FcStrFree (parent);
+    return ret;
+}
+
 /* write serialized state to the cache file */
 FcBool
-FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
+FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir, FcConfig *config)
 {
-    char	    *cache_file;
-    char	    *cache_hashed;
+    FcChar8	    cache_base[CACHEBASE_LEN];
+    FcChar8	    *cache_hashed;
     int 	    fd, fd_orig, i, dirs_count;
     FcAtomic 	    *atomic;
     FcCache 	    metadata;
     off_t 	    current_arch_start = 0, truncate_to;
-    char	    name_buf[FC_MAX_FILE_LEN];
-    int		    collisions;
-
+    FcStrList	    *list;
     char            *current_arch_machine_name, * header;
     void 	    *current_dir_block = 0;
+    FcChar8	    *cache_dir = NULL;
+    FcChar8	    *test_dir;
 
     dir = FcConfigNormalizeFontDir (FcConfigGetCurrent(), dir);
     if (!dir)
 	return FcFalse;
 
-    cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
-    if (!cache_file)
-        goto bail;
-
-    /* Ensure that we're not trampling a cache for some other dir. */
-    /* This is slightly different from FcDirCacheOpen, since it 
-     * needs the filename, not the file descriptor. */
-    fd = -1; collisions = 0;
-    do
-    {
-	cache_hashed = FcDirCacheHashName (cache_file, collisions++);
-	if (!cache_hashed)
-	    goto bail0;
-
-	if (fd > 0)
-	    close (fd);
-	fd = open(cache_hashed, O_RDONLY);
-	if (fd == -1)
-	    break;
-	FcCacheReadString (fd, name_buf, sizeof (name_buf));
-	close (fd);
-
-	if (!strlen(name_buf))
+    /*
+     * Write it to the first directory in the list which is writable
+     */
+    
+    list = FcStrListCreate (config->cacheDirs);
+    if (!list)
+	return FcFalse;
+    while ((test_dir = FcStrListNext (list))) {
+	if (access ((char *) test_dir, W_OK|X_OK) == 0)
+	{
+	    cache_dir = test_dir;
 	    break;
-
-	if (strcmp (name_buf, cache_file) != 0)
-	    continue;
-    } while (0);
+	}
+	else
+	{
+	    /*
+	     * If the directory doesn't exist, try to create it
+	     */
+	    if (access ((char *) test_dir, F_OK) == -1) {
+		if (FcMakeDirectory (test_dir))
+		{
+		    cache_dir = test_dir;
+		    break;
+		}
+	    }
+	}
+    }
+    FcStrListDone (list);
+    if (!cache_dir)
+	return FcFalse;
+    FcDirCacheBasename (dir, cache_base);
+    cache_hashed = FcStrPlus (cache_dir, cache_base);
+    if (!cache_hashed)
+        return FcFalse;
 
     current_dir_block = FcDirCacheProduce (set, &metadata);
 
@@ -1146,38 +1337,24 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
 	goto bail1;
 
     if (FcDebug () & FC_DBG_CACHE)
-        printf ("FcDirCacheWriteDir cache_file \"%s\"\n", cache_file);
+        printf ("FcDirCacheWriteDir dir \"%s\" file \"%s\"\n",
+		dir, cache_hashed);
 
     atomic = FcAtomicCreate ((FcChar8 *)cache_hashed);
     if (!atomic)
 	goto bail1;
 
     if (!FcAtomicLock (atomic))
-    {
-	/* Now try rewriting the original version of the file. */
-	FcAtomicDestroy (atomic);
+	goto bail2;
 
-	atomic = FcAtomicCreate ((FcChar8 *)cache_file);
-	fd_orig = open (cache_file, O_RDONLY);
-	if (fd_orig == -1)
-	    fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY);
+    /* open the original file to save relevant portions */
+    fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY | O_BINARY);
 
-	fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 0666);
-	if (fd == -1)
-	    goto bail2;
-    }
-
-    /* In all cases, try opening the real location of the cache file first. */
-    /* (even if that's not atomic.) */
-    fd_orig = open (cache_file, O_RDONLY);
-    if (fd_orig == -1)
-	fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY);
-
-    fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 0666);
+    fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666);
     if (fd == -1)
 	goto bail3;
 
-    FcCacheWriteString (fd, cache_file);
+    FcCacheWriteString (fd, (char *) dir);
 
     current_arch_machine_name = FcCacheMachineSignature ();
     current_arch_start = 0;
@@ -1188,10 +1365,8 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
 
     if (current_arch_start < 0)
     {
-	off_t i = lseek(fd_orig, 0, SEEK_END);
-	if (i < strlen (FC_GLOBAL_MAGIC_COOKIE)+1)
-	    i = strlen (FC_GLOBAL_MAGIC_COOKIE)+1;
-	current_arch_start = FcCacheNextOffset (i);
+	off_t offset = lseek(fd_orig, 0, SEEK_END);
+	current_arch_start = FcCacheNextOffset (offset);
     }
 
     if (fd_orig != -1 && !FcCacheCopyOld(fd, fd_orig, current_arch_start))
@@ -1201,8 +1376,17 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
         close (fd_orig);
 
     current_arch_start = lseek(fd, 0, SEEK_CUR);
+#if defined (HAVE_FTRUNCATE)
     if (ftruncate (fd, current_arch_start) == -1)
 	goto bail4;
+#else
+#if defined (HAVE_CHSIZE)
+    if (chsize (fd, current_arch_start) == -1)
+	goto bail4;
+#else
+    goto bail4;
+#endif
+#endif
 
     /* allocate space for subdir names in this block */
     dirs_count = 0;
@@ -1224,24 +1408,41 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
         FcCacheWriteString (fd, (char *)dirs->strs[i]);
     FcCacheWriteString (fd, "");
 
-    write (fd, &metadata, sizeof(FcCache));
+    if (write (fd, &metadata, sizeof(FcCache)) != sizeof(FcCache)) 
+    {
+	perror("write metadata");
+	goto bail5;
+    }
     if (metadata.count)
     {
-	lseek (fd, FcCacheNextOffset (lseek(fd, 0, SEEK_END)), SEEK_SET);
-	write (fd, current_dir_block, metadata.count);
+	off_t off = FcCacheNextOffset (lseek(fd, 0, SEEK_END));
+	if (lseek (fd, off, SEEK_SET) != off)
+	    perror("lseek");
+	else if (write (fd, current_dir_block, metadata.count) !=
+		 metadata.count)
+	    perror("write current_dir_block");
 	free (current_dir_block);
+        current_dir_block = 0;
     }
 
     /* this actually serves to pad out the cache file, if needed */
+#if defined (HAVE_FTRUNCATE)
     if (ftruncate (fd, current_arch_start + truncate_to) == -1)
 	goto bail5;
+#else
+#if defined (HAVE_CHSIZE)
+    if (chsize (fd, current_arch_start + truncate_to) == -1)
+	goto bail5;
+#else
+    goto bail5;
+#endif
+#endif
 
     free (header);
     close(fd);
     if (!FcAtomicReplaceOrig(atomic))
-        goto bail5;
+        goto bail3;
     FcStrFree ((FcChar8 *)cache_hashed);
-    FcStrFree ((FcChar8 *)cache_file);
     FcAtomicUnlock (atomic);
     FcAtomicDestroy (atomic);
     return FcTrue;
@@ -1256,12 +1457,8 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
     FcAtomicDestroy (atomic);
  bail1:
     FcStrFree ((FcChar8 *)cache_hashed);
- bail0:
-    unlink ((char *)cache_file);
-    FcStrFree ((FcChar8 *)cache_file);
     if (current_dir_block)
         free (current_dir_block);
- bail:
     return FcFalse;
 }
 
@@ -1295,7 +1492,11 @@ FcCacheMachineSignature ()
 	     (unsigned int)sizeof (FcCharLeaf),
 	     (unsigned int)sizeof (FcChar32),
 	     (unsigned int)sizeof (FcCache),
+#if defined (HAVE_SYSCONF)
 	     (unsigned int)sysconf(_SC_PAGESIZE));
+#else
+	     (unsigned int)FC_HARDCODED_PAGESIZE);
+#endif
 
     return buf;
 }