*/
int
-FcStat (const char *file, struct stat *statb)
+FcStat (FcConfig *config, const FcChar8 *file, struct stat *statb)
{
WIN32_FILE_ATTRIBUTE_DATA wfad;
char full_path_name[MAX_PATH];
return 0;
}
+
+#else
+
+int
+FcStat (FcConfig *config, const FcChar8 *file, struct stat *statb)
+{
+ int ret;
+ FcChar8 *fullFile = FcConfigGetRootPlus (config, file);
+
+ if (fullFile)
+ file = fullFile;
+ ret = stat ((char *) file, statb);
+ if (fullFile)
+ FcStrFree (fullFile);
+
+ return ret;
+}
+
#endif
static const char bin2hex[] = { '0', '1', '2', '3',
}
static int
-FcDirCacheOpenFile (const FcChar8 *cache_file, struct stat *file_stat)
+FcDirCacheOpenFile (FcConfig *config, const FcChar8 *cache_file, struct stat *file_stat)
{
int fd;
+ FcChar8 *fullFile;
#ifdef _WIN32
- if (FcStat (cache_file, file_stat) < 0)
+ if (FcStat (config, cache_file, file_stat) < 0)
return -1;
#endif
- fd = open((char *) cache_file, O_RDONLY | O_BINARY);
+ fullFile = FcConfigGetRootPlus (config, cache_file);
+ if (fullFile)
+ cache_file = fullFile;
+ fd = open ((char *) cache_file, O_RDONLY | O_BINARY);
+ if (fullFile)
+ FcStrFree (fullFile);
if (fd < 0)
return fd;
#ifndef _WIN32
*/
static FcBool
FcDirCacheProcess (FcConfig *config, const FcChar8 *dir,
- FcBool (*callback) (int fd, struct stat *fd_stat,
+ FcBool (*callback) (FcConfig *config, int fd, struct stat *fd_stat,
struct stat *dir_stat, void *closure),
void *closure, FcChar8 **cache_file_ret)
{
struct stat file_stat, dir_stat;
FcBool ret = FcFalse;
- if (FcStat ((char *) dir, &dir_stat) < 0)
+ if (FcStat (config, dir, &dir_stat) < 0)
return FcFalse;
FcDirCacheBasename (dir, cache_base);
FcChar8 *cache_hashed = FcStrPlus (cache_dir, cache_base);
if (!cache_hashed)
break;
- fd = FcDirCacheOpenFile (cache_hashed, &file_stat);
+ fd = FcDirCacheOpenFile (config, cache_hashed, &file_stat);
if (fd >= 0) {
- ret = (*callback) (fd, &file_stat, &dir_stat, closure);
+ ret = (*callback) (config, fd, &file_stat, &dir_stat, closure);
close (fd);
if (ret)
{
}
static FcBool
-FcCacheTimeValid (FcCache *cache, struct stat *dir_stat)
+FcCacheTimeValid (FcConfig *config, FcCache *cache, struct stat *dir_stat)
{
struct stat dir_static;
if (!dir_stat)
{
- if (FcStat ((const char *) FcCacheDir (cache), &dir_static) < 0)
+ if (FcStat (config, FcCacheDir (cache), &dir_static) < 0)
return FcFalse;
dir_stat = &dir_static;
}
* Map a cache file into memory
*/
static FcCache *
-FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
+FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *dir_stat)
{
FcCache *cache;
FcBool allocated = FcFalse;
cache = FcCacheFindByStat (fd_stat);
if (cache)
{
- if (FcCacheTimeValid (cache, dir_stat))
+ if (FcCacheTimeValid (config, cache, dir_stat))
return cache;
FcDirCacheUnload (cache);
cache = NULL;
if (cache->magic != FC_CACHE_MAGIC_MMAP ||
cache->version < FC_CACHE_CONTENT_VERSION ||
cache->size != fd_stat->st_size ||
- !FcCacheTimeValid (cache, dir_stat) ||
+ !FcCacheTimeValid (config, cache, dir_stat) ||
!FcCacheInsert (cache, fd_stat))
{
if (allocated)
}
static FcBool
-FcDirCacheMapHelper (int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure)
+FcDirCacheMapHelper (FcConfig *config, int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure)
{
- FcCache *cache = FcDirCacheMapFd (fd, fd_stat, dir_stat);
+ FcCache *cache = FcDirCacheMapFd (config, fd, fd_stat, dir_stat);
if (!cache)
return FcFalse;
FcCache *
FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat)
+{
+ return FcDirCacheLoadFile2 (cache_file, FcConfigGetCurrent (), file_stat);
+}
+
+FcCache *
+FcDirCacheLoadFile2 (const FcChar8 *cache_file, FcConfig *config, struct stat *file_stat)
{
int fd;
FcCache *cache;
if (!file_stat)
file_stat = &my_file_stat;
- fd = FcDirCacheOpenFile (cache_file, file_stat);
+ fd = FcDirCacheOpenFile (config, cache_file, file_stat);
if (fd < 0)
return NULL;
- cache = FcDirCacheMapFd (fd, file_stat, NULL);
+ cache = FcDirCacheMapFd (config, fd, file_stat, NULL);
close (fd);
return cache;
}
* the magic number and the size field
*/
static FcBool
-FcDirCacheValidateHelper (int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure)
+FcDirCacheValidateHelper (FcConfig *config, int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure)
{
FcBool ret = FcTrue;
FcCache c;
FcSerialize *serialize = FcSerializeCreate ();
FcCache *cache;
int i;
- intptr_t cache_offset;
- intptr_t dirs_offset;
FcChar8 *dir_serialize;
intptr_t *dirs_serialize;
FcFontSet *set_serialize;
/*
* Space for cache structure
*/
- cache_offset = FcSerializeReserve (serialize, sizeof (FcCache));
+ FcSerializeReserve (serialize, sizeof (FcCache));
/*
* Directory name
*/
/*
* Subdirs
*/
- dirs_offset = FcSerializeAlloc (serialize, dirs, dirs->num * sizeof (FcChar8 *));
+ FcSerializeAlloc (serialize, dirs, dirs->num * sizeof (FcChar8 *));
for (i = 0; i < dirs->num; i++)
if (!FcStrSerializeAlloc (serialize, dirs->strs[i]))
goto bail1;
FcStrList *list;
FcChar8 *cache_dir = NULL;
FcChar8 *test_dir;
+ FcChar8 *full_test_dir;
+ FcBool free_test_dir;
FcCacheSkip *skip;
struct stat cache_stat;
int magic;
list = FcStrListCreate (config->cacheDirs);
if (!list)
return FcFalse;
+ free_test_dir = FcFalse;
while ((test_dir = FcStrListNext (list))) {
+ if (free_test_dir)
+ FcStrFree (full_test_dir);
+ free_test_dir = FcFalse;
+
+ full_test_dir = FcConfigGetRootPlus (config, test_dir);
+ if (full_test_dir)
+ {
+ free_test_dir = FcTrue;
+ test_dir = full_test_dir;
+ }
+
if (access ((char *) test_dir, W_OK|X_OK) == 0)
{
cache_dir = test_dir;
}
FcStrListDone (list);
if (!cache_dir)
- return FcFalse;
+ goto bail0;
FcDirCacheBasename (dir, cache_base);
cache_hashed = FcStrPlus (cache_dir, cache_base);
if (!cache_hashed)
- return FcFalse;
+ goto bail0;
if (FcDebug () & FC_DBG_CACHE)
printf ("FcDirCacheWriteDir dir \"%s\" file \"%s\"\n",
if (!atomic)
goto bail1;
- if (!FcAtomicLock (atomic))
+ if (!FcAtomicLock2 (config, atomic))
goto bail3;
fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666);
*/
if (cache->size < FC_CACHE_MIN_MMAP &&
(skip = FcCacheFindByAddr (cache)) &&
- FcStat (cache_hashed, &cache_stat))
+ FcStat (config, cache_hashed, &cache_stat))
{
skip->cache_dev = cache_stat.st_dev;
skip->cache_ino = cache_stat.st_ino;
FcAtomicDestroy (atomic);
bail1:
FcStrFree (cache_hashed);
+ bail0:
+ if (free_test_dir)
+ FcStrFree (full_test_dir);
+ return FcFalse;
+}
+
+static void
+align_fd (int fd, off_t *pos, int align)
+{
+ int adj = *pos & (align - 1);
+ if (adj)
+ {
+ lseek (fd, adj, SEEK_CUR);
+ *pos += adj;
+ }
+}
+
+static uint64_t
+_conv_num (int src_fd, int dst_fd, off_t *src_pos, off_t *dst_pos,
+ FcBool src_be, FcBool dst_be, int src_psize, int dst_psize,
+ int src_read, int dst_write)
+{
+ unsigned char src[8], dst[8], *s, *d;
+ int i, src_step, dst_step;
+ uint64_t ret;
+
+ align_fd (src_fd, src_pos, src_read);
+ read (src_fd, src, src_read);
+ *src_pos += src_read;
+
+ if (src_be)
+ s = &src[src_read - 1], src_step = -1;
+ else
+ s = src, src_step = 1;
+ if (dst_be)
+ d = &dst[dst_write - 1], dst_step = -1;
+ else
+ d = dst, dst_step = 1;
+
+ ret = 0;
+ for (i = 0; i < src_read; ++i)
+ {
+ ret |= ((uint64_t) *s) << (8 * i);
+ *d = *s;
+ s += src_step;
+ d += dst_step;
+ }
+ for (; i < dst_write; ++i)
+ {
+ *d = 0;
+ d += dst_step;
+ }
+
+ align_fd (dst_fd, dst_pos, dst_write);
+ write (dst_fd, dst, dst_write);
+ *dst_pos += dst_write;
+
+ return ret;
+}
+#define conv_num(r, w) _conv_num (src_fd, dst_fd, &src_pos, &dst_pos, src_be, dst_be, src_psize, dst_psize, r, w)
+#define conv_ptr() conv_num (src_psize, dst_psize)
+#define conv_int() conv_num (4, 4)
+
+FcBool
+FcDirCacheConvert (const FcChar8 *src_cache, const FcChar8 *src_type,
+ const FcChar8 *dst_cache, const FcChar8 *dst_type)
+{
+ /* See fcarch.h for the spec used here */
+ FcCache c;
+ FcBool src_be;
+ FcBool dst_be;
+ int src_psize;
+ int dst_psize;
+ int src_dalign;
+ int dst_dalign;
+ int src_fd;
+ int dst_fd;
+ off_t src_pos;
+ off_t dst_pos;
+ struct stat src_st;
+
+ src_be = !strncmp ((const char *) src_type, "be", 2);
+ dst_be = !strncmp ((const char *) dst_type, "be", 2);
+
+ src_psize = !strncmp ((const char *) src_type + 2, "32", 2) ? 4 : 8;
+ dst_psize = !strncmp ((const char *) dst_type + 2, "32", 2) ? 4 : 8;
+
+ if (src_psize == 4)
+ src_dalign = !strncmp ((const char *) src_type + 4, "d4", 2) ? 4 : 8;
+ else
+ src_dalign = src_psize;
+
+ if (dst_psize == 4)
+ dst_dalign = !strncmp ((const char *) dst_type + 4, "d4", 2) ? 4 : 8;
+ else
+ dst_dalign = dst_psize;
+
+ src_fd = open ((const char *) src_cache, O_RDONLY);
+ if (src_fd == -1)
+ return FcFalse;
+ dst_fd = open ((const char *) dst_cache, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
+ if (dst_fd == -1)
+ {
+ close (src_fd);
+ return FcFalse;
+ }
+ src_pos = dst_pos = 0;
+
+ /* Process FcCache at start of file */
+ c.magic = conv_int ();
+ c.version = conv_int ();
+ c.size = conv_ptr ();
+ c.dir = conv_ptr ();
+ c.dirs = conv_ptr ();
+ c.dirs_count = conv_int ();
+ c.set = conv_ptr ();
+ c.mtime = conv_int ();
+ align_fd (dst_fd, &dst_pos, dst_psize);
+
return FcFalse;
}
MD5Transform(ctx->buf, (FcChar32 *) ctx->in);
byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
git.wh0rd.org / fontconfig.git / blobdiff