Patrick Lam <plam@mit.edu>

[fontconfig.git] / src / fccache.c

diff --git a/src/fccache.c b/src/fccache.c
index 98f0a88294ea837ac07b4e9dc55af3a8ab0ceae5..248c6d1584569aa32870f3eb8d2db77f64678fe1 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -26,15 +26,19 @@
 #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 <sys/mman.h>
+#  include <sys/utsname.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 
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -206,7 +210,7 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
     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);
     if (!FcCacheReadString (cache->fd, candidate_arch_machine_name, 
@@ -410,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;
@@ -458,8 +462,17 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
        goto bail3;
 
     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)
@@ -468,6 +481,8 @@ 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;
@@ -488,6 +503,7 @@ FcGlobalCacheSave (FcGlobalCache    *cache,
 
     for (dir = cache->dirs; dir; dir = dir->next)
     {
+       int i;
        const char * d;
        off_t off;
 
@@ -599,7 +615,11 @@ FcCacheNextOffset(off_t w)
 {
     static long pagesize = -1;
     if (pagesize == -1)
+#if defined (HAVE_SYSCONF)
        pagesize = sysconf(_SC_PAGESIZE);
+#else
+       pagesize = FC_HARDCODED_PAGESIZE;
+#endif
     if (w % pagesize == 0) 
        return w;
     else
@@ -634,7 +654,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;
 
@@ -643,9 +663,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
@@ -1158,20 +1177,35 @@ FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config)
     }
 
     pos = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR));
+#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;
+#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 *
@@ -1181,12 +1215,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();
@@ -1206,7 +1252,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);
 
@@ -1323,8 +1369,8 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
 
     if (current_arch_start < 0)
     {
-       off_t i = lseek(fd_orig, 0, SEEK_END);
-       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))
@@ -1334,8 +1380,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;
@@ -1371,11 +1426,21 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
                 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);
@@ -1436,7 +1501,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;
 }