X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffccache.c;h=295ee7750abc21ac215a395b9839f33287dbee36;hb=00f059e930f12ca7c66cf2ffbc6c4ae789912af7;hp=886e652515423cf7d2220d33f467bc15467ec3a5;hpb=28aefd013d1896ffbf389596109eaec729d5d9a5;p=fontconfig.git diff --git a/src/fccache.c b/src/fccache.c index 886e652..295ee77 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -23,43 +23,38 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include "fcint.h" +#include "../fc-arch/fcarch.h" +#include #include #include #include -#include -#include #include -#include -#include "fcint.h" -#include +#if defined(HAVE_MMAP) || defined(__CYGWIN__) +# include +# include +#elif defined(_WIN32) +# include +#endif #define ENDIAN_TEST 0x12345678 -#define MACHINE_SIGNATURE_SIZE 9 + 5*20 + 1 - -static int -FcDirCacheOpen (const FcChar8 * dir); - -static char * -FcDirCacheHashName (char * cache_file, int collisions); +#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1) +/* for when we don't have sysconf: */ +#define FC_HARDCODED_PAGESIZE 8192 -static off_t -FcCacheSkipToArch (int fd, const char * arch); +#ifndef O_BINARY +#define O_BINARY 0 +#endif -static FcBool -FcCacheCopyOld (int fd, int fd_orig, off_t start); +static FILE * +FcDirCacheOpen (FcConfig *config, const FcChar8 *dir, FcChar8 **cache_path); static void * FcDirCacheProduce (FcFontSet *set, FcCache * metadata); -static FcBool -FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config); - -static int +static off_t FcCacheNextOffset(off_t w); -static char * -FcCacheMachineSignature (void); - static FcBool FcCacheHaveBank (int bank); @@ -80,72 +75,23 @@ static void MD5Transform(FcChar32 buf[4], FcChar32 in[16]); #define FC_DBG_CACHE_REF 1024 static char * -FcCacheReadString (int fd, char *dest, int len) +FcCacheReadString (FILE *file, char *dest, int len) { - FcChar8 c; - FcBool escape; - int size; - int i; + int c; + char *d = dest; if (len == 0) return 0; - - size = len; - i = 0; - escape = FcFalse; - while (read (fd, &c, 1) == 1) - { - if (!escape) - { - switch (c) { - case '"': - c = '\0'; - break; - case '\\': - escape = FcTrue; - continue; - } - } - if (i == size) - { - dest[i++] = 0; - return dest; - } - dest[i++] = c; + + while ((c = getc (file)) != EOF && len > 0) { + *d++ = c; if (c == '\0') return dest; - escape = FcFalse; + len--; } return 0; } -static void -FcCacheSkipString (int fd) -{ - FcChar8 c; - FcBool escape; - - escape = FcFalse; - while (read (fd, &c, 1) == 1) - { - if (!escape) - { - switch (c) { - case '"': - c = '\0'; - break; - case '\\': - escape = FcTrue; - continue; - } - } - if (c == '\0') - return; - escape = FcFalse; - } - return; -} - static FcBool FcCacheWriteString (int fd, const char *chars) { @@ -154,623 +100,114 @@ FcCacheWriteString (int fd, const char *chars) return FcTrue; } -static void -FcGlobalCacheDirDestroy (FcGlobalCacheDir *d) -{ - FcStrSetDestroy (d->subdirs); - FcMemFree (FC_MEM_STRING, strlen (d->name)+1); - free (d->name); - FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCacheDir)); - free (d); -} - -FcGlobalCache * -FcGlobalCacheCreate (void) -{ - FcGlobalCache *cache; - - cache = malloc (sizeof (FcGlobalCache)); - if (!cache) - return 0; - FcMemAlloc (FC_MEM_CACHE, sizeof (FcGlobalCache)); - cache->dirs = 0; - cache->updated = FcFalse; - cache->fd = -1; - return cache; -} - -void -FcGlobalCacheDestroy (FcGlobalCache *cache) -{ - FcGlobalCacheDir *d, *next; - - for (d = cache->dirs; d; d = next) - { - next = d->next; - FcGlobalCacheDirDestroy (d); - } - FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCache)); - free (cache); -} - -void -FcGlobalCacheLoad (FcGlobalCache *cache, - FcStrSet *staleDirs, - const FcChar8 *cache_file, - FcConfig *config) -{ - char name_buf[FC_MAX_FILE_LEN]; - FcGlobalCacheDir *d, *next; - FcFileTime config_time = FcConfigModifiedTime (config); - char * current_arch_machine_name; - char candidate_arch_machine_name[MACHINE_SIGNATURE_SIZE + 9]; - off_t current_arch_start; - - struct stat cache_stat, dir_stat; - char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1]; - - if (stat ((char *) cache_file, &cache_stat) < 0) - return; - - cache->fd = open ((char *) cache_file, O_RDONLY); - if (cache->fd == -1) - return; - - cache->updated = FcFalse; - - if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf))) - goto bail_and_destroy; - if (strcmp (name_buf, FC_GLOBAL_MAGIC_COOKIE) != 0) - 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; - - lseek (cache->fd, current_arch_start, SEEK_SET); - 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; - - while (1) - { - off_t targ; - - if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)) || - !strlen(name_buf)) - break; - - /* Directory must be older than the global cache file; also - cache must be newer than the config file. */ - if (stat ((char *) name_buf, &dir_stat) < 0 || - dir_stat.st_mtime > cache_stat.st_mtime || - (config_time.set && cache_stat.st_mtime < config_time.time)) - { - FcCache md; - - 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; - } - - d = malloc (sizeof (FcGlobalCacheDir)); - if (!d) - goto bail1; - - d->next = cache->dirs; - cache->dirs = d; - - d->name = (char *)FcStrCopy ((FcChar8 *)name_buf); - d->ent = 0; - - d->subdirs = FcStrSetCreate(); - 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; - if (lseek (cache->fd, targ, SEEK_SET) != targ) - goto bail1; - } - return; - - bail1: - for (d = cache->dirs; d; d = next) - { - next = d->next; - free (d); - } - cache->dirs = 0; - - close (cache->fd); - cache->fd = -1; - return; - - bail_and_destroy: - close (cache->fd); - cache->fd = -1; - - if (stat ((char *) cache_file, &cache_stat) == 0) - unlink ((char *)cache_file); - - return; - -} - -FcBool -FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, const char *dir, FcConfig *config) -{ - FcGlobalCacheDir *d; - FcBool ret = FcFalse; - int i; - - if (cache->fd == -1) - return FcFalse; - - 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) - { - lseek (cache->fd, d->offset, SEEK_SET); - if (!FcDirCacheConsume (cache->fd, d->name, set, config)) - return FcFalse; - - if (strcmp (d->name, dir) == 0) - { - for (i = 0; i < d->subdirs->num; i++) - FcStrSetAdd (dirs, (FcChar8 *)d->subdirs->strs[i]); - - ret = FcTrue; - } - } - } - - return ret; -} - -FcBool -FcGlobalCacheUpdate (FcGlobalCache *cache, - FcStrSet *dirs, - const char *name, - FcFontSet *set, - FcConfig *config) -{ - FcGlobalCacheDir *d; - int i; - - name = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)name); - for (d = cache->dirs; d; d = d->next) - { - if (strcmp(d->name, name) == 0) - break; - } - - if (!d) - { - d = malloc (sizeof (FcGlobalCacheDir)); - if (!d) - return FcFalse; - d->next = cache->dirs; - cache->dirs = d; - } - - cache->updated = FcTrue; - - d->name = (char *)FcStrCopy ((FcChar8 *)name); - d->ent = FcDirCacheProduce (set, &d->metadata); - d->offset = 0; - d->subdirs = FcStrSetCreate(); - for (i = 0; i < dirs->num; i++) - FcStrSetAdd (d->subdirs, dirs->strs[i]); - return FcTrue; -} - -FcBool -FcGlobalCacheSave (FcGlobalCache *cache, - const FcChar8 *cache_file, - FcConfig *config) -{ - int fd, fd_orig, i; - FcGlobalCacheDir *dir; - FcAtomic *atomic; - off_t current_arch_start = 0, truncate_to; - char * current_arch_machine_name, * header; - - if (!cache->updated) - return FcTrue; - -#if defined (HAVE_GETUID) && defined (HAVE_GETEUID) - /* Set-UID programs can't safely update the cache */ - if (getuid () != geteuid ()) - return FcFalse; -#endif - - atomic = FcAtomicCreate (cache_file); - if (!atomic) - return FcFalse; - - if (!FcAtomicLock (atomic)) - goto bail1; - fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, - S_IRUSR | S_IWUSR); - if (fd == -1) - goto bail2; - FcCacheWriteString (fd, FC_GLOBAL_MAGIC_COOKIE); - - fd_orig = open ((char *) FcAtomicOrigFile(atomic), O_RDONLY); - - current_arch_machine_name = FcCacheMachineSignature (); - if (fd_orig == -1) - current_arch_start = 0; - else - current_arch_start = FcCacheSkipToArch (fd_orig, - current_arch_machine_name); - - 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); - } - - 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 (ftruncate (fd, current_arch_start) == -1) - goto bail3; - - header = malloc (10 + strlen (current_arch_machine_name)); - if (!header) - goto bail3; - - truncate_to = current_arch_start + strlen(current_arch_machine_name) + 11; - for (dir = cache->dirs; dir; dir = dir->next) - { - truncate_to += strlen(dir->name) + 1; - truncate_to += sizeof (FcCache); - truncate_to = FcCacheNextOffset (truncate_to); - truncate_to += dir->metadata.count; - - for (i = 0; i < dir->subdirs->size; i++) - truncate_to += strlen((char *)dir->subdirs->strs[i]) + 1; - truncate_to ++; - } - truncate_to -= current_arch_start; - - sprintf (header, "%8x ", (int)truncate_to); - strcat (header, current_arch_machine_name); - if (!FcCacheWriteString (fd, header)) - goto bail4; - - for (dir = cache->dirs; dir; dir = dir->next) - { - if (dir->name) - { - const char * d = (const char *)FcConfigNormalizeFontDir (config, (const FcChar8 *)dir->name); - - FcCacheWriteString (fd, d); - - for (i = 0; i < dir->subdirs->size; i++) - FcCacheWriteString (fd, (char *)dir->subdirs->strs[i]); - FcCacheWriteString (fd, ""); - - 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); - } - } - FcCacheWriteString (fd, ""); - - if (close (fd) == -1) - goto bail25; - - if (!FcAtomicReplaceOrig (atomic)) - goto bail25; - - FcAtomicUnlock (atomic); - FcAtomicDestroy (atomic); - - cache->updated = FcFalse; - return FcTrue; - - bail4: - free (header); - bail3: - if (fd_orig != -1) - close (fd_orig); - - close (fd); - bail25: - FcAtomicDeleteNew (atomic); - bail2: - FcAtomicUnlock (atomic); - bail1: - FcAtomicDestroy (atomic); - return FcFalse; -} - /* * Find the next presumably-mmapable offset after the supplied file * position. */ -static int +static off_t 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 return ((w / pagesize)+1)*pagesize; } -/* return the address of the segment for the provided arch, - * or -1 if arch not found */ -static off_t -FcCacheSkipToArch (int fd, const char * arch) +/* Does not check that the cache has the appropriate arch section. */ +FcBool +FcDirCacheValid (const FcChar8 *dir, FcConfig *config) { - char candidate_arch_machine_name_count[MACHINE_SIGNATURE_SIZE + 9]; - char * candidate_arch; - off_t current_arch_start = 0; - - lseek (fd, 0, SEEK_SET); - FcCacheSkipString (fd); - current_arch_start = lseek (fd, 0, SEEK_CUR); - - /* skip arches that are not the current arch */ - while (1) - { - long bs; + FILE *file; - if (lseek (fd, current_arch_start, SEEK_SET) != current_arch_start) - return -1; + file = FcDirCacheOpen (config, dir, NULL); - if (FcCacheReadString (fd, candidate_arch_machine_name_count, - sizeof (candidate_arch_machine_name_count)) == 0) - return -1; - if (!strlen(candidate_arch_machine_name_count)) - return -1; - bs = strtol(candidate_arch_machine_name_count, &candidate_arch, 16); - - // count = 0 should probably be distinguished from the !bs condition - if (!bs || bs < strlen (candidate_arch_machine_name_count)) - return -1; - - candidate_arch++; /* skip leading space */ - - if (strcmp (candidate_arch, arch)==0) - return current_arch_start; - current_arch_start += bs; - } - - return -1; -} - -/* Cuts out the segment at the file pointer (moves everything else - * down to cover it), and leaves the file pointer at the end of the - * file. */ -static FcBool -FcCacheCopyOld (int fd, int fd_orig, off_t start) -{ - char * buf = malloc (8192); - char candidate_arch_machine_name[MACHINE_SIGNATURE_SIZE + 9]; - long bs; - int c, bytes_skipped; - off_t loc; - - if (!buf) + if (file != NULL) return FcFalse; + fclose (file); - loc = 0; - lseek (fd, 0, SEEK_SET); lseek (fd_orig, 0, SEEK_SET); - do - { - int b = 8192; - if (loc + b > start) - b = start - loc; - - if ((c = read (fd_orig, buf, b)) <= 0) - break; - if (write (fd, buf, c) < 0) - goto bail; - - loc += c; - } - while (c > 0); - - lseek (fd, start, SEEK_SET); - if (FcCacheReadString (fd, candidate_arch_machine_name, - sizeof (candidate_arch_machine_name)) == 0) - goto done; - if (!strlen(candidate_arch_machine_name)) - goto done; - - bs = strtol(candidate_arch_machine_name, 0, 16); - if (bs == 0) - goto done; - - bytes_skipped = 0; - do - { - lseek (fd, start+bs+bytes_skipped, SEEK_SET); - if ((c = read (fd, buf, 8192)) <= 0) - break; - lseek (fd, start+bytes_skipped, SEEK_SET); - if (write (fd, buf, c) < 0) - goto bail; - bytes_skipped += c; - } - while (c > 0); - lseek (fd, start+bytes_skipped, SEEK_SET); - - done: - free (buf); return FcTrue; - - bail: - free (buf); - return FcFalse; } -/* 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) -{ - struct stat file_stat, dir_stat; - int fd; - - if (stat ((char *) dir, &dir_stat) < 0) - return FcFalse; - - fd = FcDirCacheOpen (dir); - - if (fd < 0) - goto bail; - if (fstat (fd, &file_stat) < 0) - goto bail; - - 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; +#define CACHEBASE_LEN (1 + 32 + 1 + sizeof (FC_ARCHITECTURE) + sizeof (FC_CACHE_SUFFIX)) - bail: - close (fd); - return FcFalse; -} +static const char bin2hex[] = { '0', '1', '2', '3', + '4', '5', '6', '7', + '8', '9', 'a', 'b', + 'c', 'd', 'e', 'f' }; -/* Assumes that the cache file in 'dir' exists. - * Checks that the cache has the appropriate arch section. */ -FcBool -FcDirCacheHasCurrentArch (const FcChar8 *dir) +static FcChar8 * +FcDirCacheBasename (const FcChar8 * dir, FcChar8 cache_base[CACHEBASE_LEN]) { - int fd; - off_t current_arch_start; - char *current_arch_machine_name; + unsigned char hash[16]; + FcChar8 *hex_hash; + int cnt; + struct MD5Context ctx; - fd = FcDirCacheOpen (dir); - if (fd < 0) - goto bail; + MD5Init (&ctx); + MD5Update (&ctx, (unsigned char *)dir, strlen ((char *) dir)); - current_arch_machine_name = FcCacheMachineSignature(); - current_arch_start = FcCacheSkipToArch(fd, current_arch_machine_name); - close (fd); + MD5Final (hash, &ctx); - if (current_arch_start < 0) - return FcFalse; - - return FcTrue; + cache_base[0] = '/'; + hex_hash = cache_base + 1; + for (cnt = 0; cnt < 16; ++cnt) + { + 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_ARCHITECTURE FC_CACHE_SUFFIX); - bail: - return FcFalse; + return cache_base; } FcBool FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config) { - char *cache_file; - char *cache_hashed = 0; - int fd, collisions; - struct stat cache_stat; - char name_buf[FC_MAX_FILE_LEN]; - - dir = FcConfigNormalizeFontDir (config, dir); - cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); - if (!cache_file) - return FcFalse; + FcChar8 *cache_hashed = NULL; + FcChar8 cache_base[CACHEBASE_LEN]; + FcStrList *list; + FcChar8 *cache_dir; - /* First remove normal cache file. */ - if (stat ((char *) cache_file, &cache_stat) == 0 && - unlink ((char *)cache_file) != 0) - goto bail; + FcDirCacheBasename (dir, cache_base); - /* Next remove any applicable hashed files. */ - fd = -1; collisions = 0; - do - { - if (cache_hashed) - FcStrFree ((FcChar8 *)cache_hashed); - - cache_hashed = FcDirCacheHashName (cache_file, collisions++); - if (!cache_hashed) - goto bail; - - if (fd > 0) - close (fd); - fd = open(cache_hashed, O_RDONLY); - if (fd == -1) - { - FcStrFree ((FcChar8 *)cache_file); - return FcTrue; - } - - if (!FcCacheReadString (fd, name_buf, sizeof (name_buf)) || !strlen(name_buf)) - { - FcStrFree ((FcChar8 *)cache_hashed); - goto bail; - } - } while (strcmp (name_buf, cache_file) != 0); - - FcStrFree ((FcChar8 *)cache_file); - close (fd); - - 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; + (void) unlink ((char *) cache_hashed); } - - 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) +FcCacheReadDirs (FcConfig * config, + FcStrList *list, FcFontSet * set, FcStrSet *processed_dirs) { int ret = 0; FcChar8 *dir; - FcChar8 *file, *base; FcStrSet *subdirs; FcStrList *sublist; - struct stat statb; /* * Read in the results from 'list'. @@ -780,281 +217,198 @@ 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. + */ - 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; } - if (access ((char *) dir, X_OK) < 0) - { - switch (errno) { - case ENOENT: - case ENOTDIR: - case EACCES: - break; - default: - fprintf (stderr, "\"%s\": ", dir); - perror (""); - ret++; - } - FcStrSetDestroy (subdirs); - free (file); - continue; - } - if (stat ((char *) dir, &statb) == -1) - { - fprintf (stderr, "\"%s\": ", dir); - 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 (FcDebug () & FC_DBG_FONTSET) - printf ("cache scan dir %s\n", dir); - - FcDirScanConfig (set, subdirs, cache, - config->blanks, dir, FcFalse, config); - } + FcDirScanConfig (set, subdirs, + config->blanks, dir, FcFalse, config); + sublist = FcStrListCreate (subdirs); FcStrSetDestroy (subdirs); if (!sublist) { 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, sublist, set, processed_dirs); } FcStrListDone (list); return ret; } FcFontSet * -FcCacheRead (FcConfig *config, FcGlobalCache * cache) +FcCacheRead (FcConfig *config) { - 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, 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) -{ - 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)); +/* 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 FILE * +FcDirCacheOpen (FcConfig *config, const FcChar8 *dir, FcChar8 **cache_path) +{ + FILE *file = NULL; + FcChar8 *cache_hashed = NULL; + FcChar8 cache_base[CACHEBASE_LEN]; + FcStrList *list; + FcChar8 *cache_dir; + struct stat file_stat, dir_stat; - for (i = 0; i < collisions; i++) - MD5Update (&ctx, &uscore, 1); + if (stat ((char *) dir, &dir_stat) < 0) + return NULL; - MD5Final (hash, &ctx); + FcDirCacheBasename (dir, cache_base); - for (cnt = 0; cnt < 16; ++cnt) + list = FcStrListCreate (config->cacheDirs); + if (!list) + return NULL; + + 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; + file = fopen((char *) cache_hashed, "rb"); + if (file != NULL) { + if (fstat (fileno (file), &file_stat) >= 0 && + dir_stat.st_mtime <= file_stat.st_mtime) + { + break; + } + fclose (file); + file = NULL; + } + FcStrFree (cache_hashed); + cache_hashed = NULL; } - hex_hash[32] = 0; - - tmp = FcStrPlus ((FcChar8 *)hex_hash, (FcChar8 *)FC_CACHE_SUFFIX); - if (!tmp) - return 0; + FcStrListDone (list); - cache_hashed = (char *)FcStrPlus ((FcChar8 *)PKGCACHEDIR"/", tmp); - free (tmp); + if (file == NULL) + return NULL; + + if (cache_path) + *cache_path = cache_hashed; + else + FcStrFree (cache_hashed); - return cache_hashed; + return file; } -/* 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) +/* read serialized state from the cache file */ +FcBool +FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, + const FcChar8 *dir, FcConfig *config) { - FcBool found; - int fd = -1, collisions = 0; - char *cache_file, *cache_hashed; - char name_buf[FC_MAX_FILE_LEN]; - struct stat dir_stat; + FILE *file; + FcCache metadata; + void *current_dir_block; + char subdir_name[FC_MAX_FILE_LEN + 1 + 12 + 1]; - cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); - if (!cache_file) - return -1; + file = FcDirCacheOpen (config, dir, NULL); + if (file == NULL) + goto bail; - fd = open(cache_file, O_RDONLY); - if (fd != -1) - return fd; + if (fread(&metadata, sizeof(FcCache), 1, file) != 1) + goto bail1; + if (metadata.magic != FC_CACHE_MAGIC) + goto bail1; - if (stat ((char *)dir, &dir_stat) == -1) - return -1; + while (FcCacheReadString (file, subdir_name, sizeof (subdir_name)) && + strlen (subdir_name) > 0) + FcStrSetAdd (dirs, (FcChar8 *)subdir_name); - found = FcFalse; - do + if (metadata.count) { - struct stat c; - FcChar8 * name_buf_dir; - - cache_hashed = FcDirCacheHashName (cache_file, collisions++); - if (!cache_hashed) + int fd = fileno (file); +#if defined(HAVE_MMAP) || defined(__CYGWIN__) + current_dir_block = mmap (0, metadata.count, + PROT_READ, MAP_SHARED, fd, metadata.pos); + if (current_dir_block == MAP_FAILED) + goto bail1; +#elif defined(_WIN32) { - FcStrFree ((FcChar8 *)cache_file); - return -1; - } + HANDLE hFileMap; - if (fd > 0) - close (fd); - fd = open(cache_hashed, O_RDONLY); - FcStrFree ((FcChar8 *)cache_hashed); + hFileMap = CreateFileMapping((HANDLE) _get_osfhandle(fd), NULL, PAGE_READONLY, 0, 0, NULL); + if (hFileMap == NULL) + goto bail1; - if (fd == -1) - { - FcStrFree ((FcChar8 *)cache_file); - return -1; + current_dir_block = MapViewOfFile (hFileMap, FILE_MAP_READ, 0, metadata.pos, metadata.count); + if (current_dir_block == NULL) + { + CloseHandle (hFileMap); + goto bail1; + } } - if (!FcCacheReadString (fd, name_buf, sizeof (name_buf)) || !strlen(name_buf)) - goto bail; +#else + if (lseek (fd, metatdata.pos, SEEK_SET) == -1) + goto bail1; - name_buf_dir = FcStrDirname ((FcChar8 *)name_buf); - if (stat ((char *)name_buf_dir, &c) == -1) + current_dir_block = malloc (metadata.count); + if (!current_dir_block) + goto bail1; + + /* could also use CreateMappedViewOfFile under MinGW... */ + if (read (fd, current_dir_block, metadata.count) != metadata.count) { - FcStrFree (name_buf_dir); - continue; + free (current_dir_block); + goto bail1; } - 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 */ -FcBool -FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config) -{ - int fd; - char *current_arch_machine_name; - char candidate_arch_machine_name[9+MACHINE_SIGNATURE_SIZE]; - off_t current_arch_start = 0; - char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1]; - - fd = FcDirCacheOpen (dir); - if (fd < 0) - goto bail; - - current_arch_machine_name = FcCacheMachineSignature(); - current_arch_start = FcCacheSkipToArch(fd, - current_arch_machine_name); - if (current_arch_start < 0) - goto bail1; - - lseek (fd, current_arch_start, SEEK_SET); - if (FcCacheReadString (fd, candidate_arch_machine_name, - sizeof (candidate_arch_machine_name)) == 0) - goto bail1; - - while (FcCacheReadString (fd, subdirName, sizeof (subdirName)) && strlen (subdirName) > 0) - FcStrSetAdd (dirs, (FcChar8 *)subdirName); +#endif + FcCacheAddBankDir (metadata.bank, (char *) dir); + if (!FcFontSetUnserialize (&metadata, set, current_dir_block)) + goto bail1; + } + if (config) + FcConfigAddFontDir (config, (FcChar8 *)dir); - if (!FcDirCacheConsume (fd, (const char *)dir, set, config)) - goto bail1; - - close(fd); + fclose(file); return FcTrue; bail1: - close (fd); + fclose (file); bail: return FcFalse; } -static FcBool -FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config) -{ - FcCache metadata; - void * current_dir_block; - off_t pos; - - read(fd, &metadata, sizeof(FcCache)); - if (metadata.magic != FC_CACHE_MAGIC) - return FcFalse; - - if (!metadata.count) - { - pos = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR)); - lseek (fd, pos, SEEK_SET); - if (config) - FcConfigAddFontDir (config, (FcChar8 *)dir); - return FcTrue; - } - - pos = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR)); - 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; - - FcCacheAddBankDir (metadata.bank, dir); - if (config) - FcConfigAddFontDir (config, (FcChar8 *)dir); - - if (!FcFontSetUnserialize (&metadata, set, current_dir_block)) - return FcFalse; - - return FcTrue; -} - static void * FcDirCacheProduce (FcFontSet *set, FcCache *metadata) { @@ -1062,12 +416,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(); @@ -1087,7 +453,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); @@ -1104,55 +470,77 @@ 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; - int fd, fd_orig, i, dirs_count; + FcChar8 cache_base[CACHEBASE_LEN]; + FcChar8 *cache_hashed; + int fd, i; FcAtomic *atomic; FcCache metadata; - off_t current_arch_start = 0, truncate_to; - char name_buf[FC_MAX_FILE_LEN]; - int collisions; - - char *current_arch_machine_name, * header; void *current_dir_block = 0; + FcStrList *list; + FcChar8 *cache_dir = NULL; + FcChar8 *test_dir; + off_t header_len; - dir = FcConfigNormalizeFontDir (FcConfigGetCurrent(), dir); - if (!dir) + /* + * Write it to the first directory in the list which is writable + */ + + list = FcStrListCreate (config->cacheDirs); + if (!list) 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; - if(!FcCacheReadString (fd, name_buf, sizeof (name_buf)) || !strlen(name_buf)) + while ((test_dir = FcStrListNext (list))) { + if (access ((char *) test_dir, W_OK|X_OK) == 0) { - close (fd); + cache_dir = test_dir; break; } - close (fd); - - 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); @@ -1160,109 +548,62 @@ 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); - - atomic = FcAtomicCreate ((FcChar8 *)cache_file); - 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); - 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); + goto bail2; - 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); - - current_arch_machine_name = FcCacheMachineSignature (); - current_arch_start = 0; - - if (fd_orig != -1) - current_arch_start = - FcCacheSkipToArch(fd_orig, current_arch_machine_name); - - 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); - } - - if (fd_orig != -1 && !FcCacheCopyOld(fd, fd_orig, current_arch_start)) - goto bail4; - - if (fd_orig != -1) - close (fd_orig); - - current_arch_start = lseek(fd, 0, SEEK_CUR); - if (ftruncate (fd, current_arch_start) == -1) - goto bail4; - - /* allocate space for subdir names in this block */ - dirs_count = 0; + + /* + * Compute file header length -- the FcCache followed by the subdir names + */ + header_len = sizeof (FcCache); for (i = 0; i < dirs->size; i++) - dirs_count += strlen((char *)dirs->strs[i]) + 1; - dirs_count ++; - - /* now write the address of the next offset */ - truncate_to = FcCacheNextOffset (FcCacheNextOffset (current_arch_start + sizeof (FcCache) + dirs_count) + metadata.count) - current_arch_start; - header = malloc (10 + strlen (current_arch_machine_name)); - if (!header) - goto bail4; - sprintf (header, "%8x ", (int)truncate_to); - strcat (header, current_arch_machine_name); - if (!FcCacheWriteString (fd, header)) + header_len += strlen ((char *)dirs->strs[i]) + 1; + + metadata.pos = FcCacheNextOffset (lseek (fd, 0, SEEK_CUR) + header_len); + metadata.subdirs = dirs->size; + + /* + * Write out the header + */ + if (write (fd, &metadata, sizeof(FcCache)) != sizeof(FcCache)) + { + perror("write metadata"); goto bail5; - + } + for (i = 0; i < dirs->size; i++) FcCacheWriteString (fd, (char *)dirs->strs[i]); - FcCacheWriteString (fd, ""); - write (fd, &metadata, sizeof(FcCache)); if (metadata.count) { - lseek (fd, FcCacheNextOffset (lseek(fd, 0, SEEK_END)), SEEK_SET); - write (fd, current_dir_block, metadata.count); + if (lseek (fd, metadata.pos, SEEK_SET) != metadata.pos) + 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 (ftruncate (fd, current_arch_start + truncate_to) == -1) - goto bail5; - - 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; bail5: - free (header); - bail4: close (fd); bail3: FcAtomicUnlock (atomic); @@ -1270,50 +611,11 @@ 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; } -static char * -FcCacheMachineSignature () -{ - static char buf[MACHINE_SIGNATURE_SIZE]; - int32_t magic = ENDIAN_TEST; - char * m = (char *)&magic; - - sprintf (buf, "%2x%2x%2x%2x " - "%4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x " - "%4x %4x %4x %4x %4x %4x %4x %4x\n", - m[0], m[1], m[2], m[3], - (unsigned int)sizeof (char), - (unsigned int)sizeof (char *), - (unsigned int)sizeof (int), - (unsigned int)sizeof (FcPattern), - (unsigned int)sizeof (FcPatternEltPtr), - (unsigned int)sizeof (struct _FcPatternElt *), - (unsigned int)sizeof (FcPatternElt), - (unsigned int)sizeof (FcObjectPtr), - (unsigned int)sizeof (FcValueListPtr), - (unsigned int)sizeof (FcValue), - (unsigned int)sizeof (FcValueBinding), - (unsigned int)sizeof (struct _FcValueList *), - (unsigned int)sizeof (FcCharSet), - (unsigned int)sizeof (FcCharLeaf **), - (unsigned int)sizeof (FcChar16 *), - (unsigned int)sizeof (FcChar16), - (unsigned int)sizeof (FcCharLeaf), - (unsigned int)sizeof (FcChar32), - (unsigned int)sizeof (FcCache), - (unsigned int)sysconf(_SC_PAGESIZE)); - - return buf; -} - static int banks_ptr = 0, banks_alloc = 0; int * _fcBankId = 0, * _fcBankIdx = 0; static const char ** bankDirs = 0;