X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffccache.c;h=135cd29ea470796fd23be012b4c769c8d664ca46;hb=db50cbdaf592349c204ab0af0e7061ea72237044;hp=45413e0b238c039642877d20b297e17aad9887a0;hpb=ea44e2184198aba956e39ae63a4914544c9719fe;p=fontconfig.git diff --git a/src/fccache.c b/src/fccache.c index 45413e0..135cd29 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -23,27 +23,32 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include "fcint.h" #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 +#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1) +/* for when we don't have sysconf: */ +#define FC_HARDCODED_PAGESIZE 8192 -static int -FcDirCacheOpen (char * cache_file); +#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, FcBool global); +FcCacheSkipToArch (int fd, const char * arch); static FcBool FcCacheCopyOld (int fd, int fd_orig, off_t start); @@ -52,10 +57,7 @@ static void * FcDirCacheProduce (FcFontSet *set, FcCache * metadata); static FcBool -FcDirCacheConsume (int fd, const char * dir, FcFontSet *set); - -FcBool -FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir); +FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config); static int FcCacheNextOffset(off_t w); @@ -85,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 @@ -160,6 +137,7 @@ FcCacheWriteString (int fd, const char *chars) 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)); @@ -192,6 +170,8 @@ FcGlobalCacheDestroy (FcGlobalCache *cache) FcGlobalCacheDirDestroy (d); } FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCache)); + if (cache->fd != -1) + close (cache->fd); free (cache); } @@ -209,25 +189,32 @@ FcGlobalCacheLoad (FcGlobalCache *cache, 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); + cache->fd = open ((char *) cache_file, O_RDONLY | O_BINARY); 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, FcTrue); + 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; @@ -235,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 @@ -246,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)); @@ -262,6 +266,18 @@ FcGlobalCacheLoad (FcGlobalCache *cache, d->name = (char *)FcStrCopy ((FcChar8 *)name_buf); d->ent = 0; + d->state = FcGCDirFileRead; + + 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; @@ -297,42 +313,63 @@ 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; 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)) + 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; } -FcBool -FcGlobalCacheUpdate (FcGlobalCache *cache, - const char *name, - FcFontSet *set) +static FcGlobalCacheDir * +FcGlobalCacheDirFind (FcGlobalCache *cache, const char *name) { FcGlobalCacheDir * d; - if (!set->nfont) - return FcTrue; + if (!cache || !name) + return NULL; for (d = cache->dirs; d; d = d->next) - { - if (strcmp(d->name, name) == 0) - break; - } + if (strcmp((const char *)d->name, (const char *)name) == 0) + return d; + + return NULL; + } + +FcBool +FcGlobalCacheUpdate (FcGlobalCache *cache, + FcStrSet *dirs, + const char *name, + FcFontSet *set, + FcConfig *config) +{ + FcGlobalCacheDir *d; + int i; + + d = FcGlobalCacheDirFind (cache, name); if (!d) { @@ -341,6 +378,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; @@ -348,12 +390,17 @@ FcGlobalCacheUpdate (FcGlobalCache *cache, d->name = (char *)FcStrCopy ((FcChar8 *)name); 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; } FcBool FcGlobalCacheSave (FcGlobalCache *cache, - const FcChar8 *cache_file) + const FcChar8 *cache_file, + FcConfig *config) { int fd, fd_orig; FcGlobalCacheDir *dir; @@ -376,33 +423,44 @@ 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) current_arch_start = 0; else current_arch_start = FcCacheSkipToArch (fd_orig, - current_arch_machine_name, - FcTrue); + current_arch_machine_name); if (current_arch_start < 0) - current_arch_start = FcCacheNextOffset (lseek(fd_orig, 0, SEEK_END)); + { + 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 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) @@ -411,10 +469,18 @@ 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); 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; @@ -423,21 +489,87 @@ FcGlobalCacheSave (FcGlobalCache *cache, if (!FcCacheWriteString (fd, header)) goto bail4; + free (header); + for (dir = cache->dirs; dir; dir = dir->next) { - if (dir->ent) - { - FcCacheWriteString (fd, dir->name); - 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); - } + int i; + const char * d; + off_t off; + + if (!dir->name || dir->state == FcGCDirDisabled) + continue; + d = dir->name; + if (!d) + continue; + + 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; @@ -472,8 +604,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 @@ -483,15 +623,14 @@ FcCacheNextOffset(off_t w) /* 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, FcBool global) +FcCacheSkipToArch (int fd, const char * arch) { char candidate_arch_machine_name_count[MACHINE_SIGNATURE_SIZE + 9]; char * candidate_arch; off_t current_arch_start = 0; lseek (fd, 0, SEEK_SET); - if (!global) - FcCacheSkipString (fd); + FcCacheSkipString (fd); current_arch_start = lseek (fd, 0, SEEK_CUR); /* skip arches that are not the current arch */ @@ -509,7 +648,7 @@ FcCacheSkipToArch (int fd, const char * arch, FcBool global) 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; @@ -518,9 +657,8 @@ FcCacheSkipToArch (int fd, const char * arch, FcBool global) 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 @@ -540,6 +678,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; @@ -591,66 +730,54 @@ FcCacheCopyOld (int fd, int fd_orig, off_t start) /* Does not check that the cache has the appropriate arch section. */ FcBool -FcDirCacheValid (const FcChar8 *dir) +FcDirCacheValid (const FcChar8 *dir, FcConfig *config) { - FcChar8 *cache_file; - struct stat file_stat, dir_stat; int fd; - if (stat ((char *) dir, &dir_stat) < 0) - return FcFalse; - - cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); - if (!cache_file) - return FcFalse; - - fd = FcDirCacheOpen ((char *)cache_file); + fd = FcDirCacheOpen (config, dir, NULL); if (fd < 0) - goto bail; - if (fstat (fd, &file_stat) < 0) - goto bail1; - + return FcFalse; close (fd); - FcStrFree (cache_file); - - /* - * 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; - - bail1: - close (fd); - bail: - FcStrFree (cache_file); - 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) { - char *cache_file; int fd; off_t current_arch_start; char *current_arch_machine_name; + FcCache metadata; + char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1]; - cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); - if (!cache_file) - return FcFalse; - - fd = FcDirCacheOpen (cache_file); + fd = FcDirCacheOpen (config, dir, NULL); if (fd < 0) goto bail; current_arch_machine_name = FcCacheMachineSignature(); - current_arch_start = FcCacheSkipToArch(fd, - current_arch_machine_name, FcFalse); + 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) @@ -658,38 +785,96 @@ FcDirCacheHasCurrentArch (const FcChar8 *dir) return FcTrue; + bail1: + close (fd); bail: - free (cache_file); return FcFalse; } -FcBool -FcDirCacheUnlink (const FcChar8 *dir) +#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]) { - FcChar8 *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); - struct stat cache_stat; + unsigned char hash[16]; + FcChar8 *hex_hash; + int cnt; + struct MD5Context ctx; - if (stat ((char *) cache_file, &cache_stat) == 0 && - unlink ((char *)cache_file) != 0) + MD5Init (&ctx); + MD5Update (&ctx, (unsigned char *)dir, strlen ((char *) dir)); + + MD5Final (hash, &ctx); + + cache_base[0] = '/'; + hex_hash = cache_base + 1; + for (cnt = 0; cnt < 16; ++cnt) { - FcStrFree (cache_file); - return FcFalse; + 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); + + return cache_base; +} - FcStrFree (cache_file); +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]; + + FcDirCacheBasename (dir, cache_base); + + list = FcStrListCreate (config->cacheDirs); + if (!list) + return FcFalse; + + while ((cache_dir = FcStrListNext (list))) + { + 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); + } + } + FcStrListDone (list); + /* return FcFalse if something went wrong */ + if (cache_dir) + return FcFalse; return FcTrue; } 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'. @@ -699,57 +884,35 @@ 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) + if (FcDirCacheRead (set, subdirs, dir, config)) { - switch (errno) { - case ENOENT: - case ENOTDIR: - case EACCES: - break; - default: - fprintf (stderr, "\"%s\": ", dir); - perror (""); - ret++; + /* 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; } - 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)) + else { if (FcDebug () & FC_DBG_FONTSET) printf ("cache scan dir %s\n", dir); @@ -763,11 +926,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; @@ -776,115 +937,109 @@ 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 (char *cache_file) -{ - int fd = -1, collisions = 0; - char *cache_hashed; - char name_buf[FC_MAX_FILE_LEN]; + FcStrListDone (list); - do + if (fd < 0) + return -1; + + if (!FcCacheReadString (fd, dir_buf, sizeof (dir_buf)) || + strcmp (dir_buf, (char *) dir) != 0) { - cache_hashed = FcDirCacheHashName (cache_file, collisions++); - if (!cache_hashed) - return -1; + close (fd); + FcStrFree (cache_hashed); + return -1; + } + + if (cache_path) + *cache_path = cache_hashed; + else + FcStrFree (cache_hashed); - if (fd > 0) - close (fd); - fd = open(cache_hashed, O_RDONLY); - if (fd == -1) - return -1; - FcCacheReadString (fd, name_buf, sizeof (name_buf)); - if (!strlen(name_buf)) - goto bail; - } while (strcmp (name_buf, cache_file) != 0); return fd; - - bail: - close (fd); - return -1; } /* read serialized state from the cache file */ FcBool -FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir) +FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config) { - char *cache_file; 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]; - cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); - if (!cache_file) - return FcFalse; - - fd = FcDirCacheOpen (cache_file); + fd = FcDirCacheOpen (config, dir, NULL); if (fd < 0) goto bail; current_arch_machine_name = FcCacheMachineSignature(); current_arch_start = FcCacheSkipToArch(fd, - current_arch_machine_name, - FcFalse); + current_arch_machine_name); if (current_arch_start < 0) goto bail1; @@ -893,49 +1048,102 @@ FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir) 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)) + if (!FcDirCacheConsume (fd, (const char *)dir, set, config)) goto bail1; close(fd); - free (cache_file); return FcTrue; bail1: close (fd); bail: - free (cache_file); return FcFalse; } static FcBool -FcDirCacheConsume (int fd, const char * dir, FcFontSet *set) +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; 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)); + + /* 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); 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 * @@ -945,12 +1153,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(); @@ -970,7 +1190,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); @@ -987,50 +1207,78 @@ 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; - 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); @@ -1038,32 +1286,37 @@ 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)) - goto bail2; + goto bail2; - fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY, 0666); + /* 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); + fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666); if (fd == -1) - goto bail3; + goto bail3; - FcCacheWriteString (fd, cache_file); + FcCacheWriteString (fd, (char *) dir); current_arch_machine_name = FcCacheMachineSignature (); current_arch_start = 0; if (fd_orig != -1) current_arch_start = - FcCacheSkipToArch(fd_orig, current_arch_machine_name, FcFalse); + FcCacheSkipToArch(fd_orig, current_arch_machine_name); if (current_arch_start < 0) - current_arch_start = FcCacheNextOffset (lseek(fd_orig, 0, SEEK_END)); + { + 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)) goto bail4; @@ -1072,8 +1325,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; @@ -1095,21 +1357,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); FcAtomicUnlock (atomic); FcAtomicDestroy (atomic); return FcTrue; @@ -1123,13 +1405,9 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir) bail2: FcAtomicDestroy (atomic); bail1: - free (cache_hashed); - bail0: - unlink ((char *)cache_file); - free (cache_file); + FcStrFree ((FcChar8 *)cache_hashed); if (current_dir_block) free (current_dir_block); - bail: return FcFalse; } @@ -1163,7 +1441,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; }