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
cache->updated = FcFalse;
if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)))
- return;
+ 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,
(config_time.set && cache_stat.st_mtime < config_time.time))
{
FcCache md;
+ off_t off;
+
+ FcStrSetAdd (staleDirs, FcStrCopy ((FcChar8 *)name_buf));
- 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;
+ /* skip subdirs */
+ while (FcCacheReadString (cache->fd, subdirName,
+ sizeof (subdirName)) &&
+ strlen (subdirName))
+ ;
+
+ 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));
d->name = (char *)FcStrCopy ((FcChar8 *)name_buf);
d->ent = 0;
- d->offset = lseek (cache->fd, 0, SEEK_CUR);
+ d->state = FcGCDirFileRead;
d->subdirs = FcStrSetCreate();
do
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;
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, d->name, 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));
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;
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;
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;
truncate_to = current_arch_start + strlen(current_arch_machine_name) + 11;
for (dir = cache->dirs; dir; dir = dir->next)
{
+ if (dir->state == FcGCDirDisabled)
+ continue;
truncate_to += strlen(dir->name) + 1;
truncate_to += sizeof (FcCache);
truncate_to = FcCacheNextOffset (truncate_to);
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);
+ const char * d;
+ off_t off;
- 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;
}
} while (strcmp (name_buf, cache_file) != 0);
- FcStrFree ((FcChar8 *)cache_file);
close (fd);
if (stat ((char *) cache_hashed, &cache_stat) == 0 &&
goto bail;
}
+ FcStrFree ((FcChar8 *)cache_file);
FcStrFree ((FcChar8 *)cache_hashed);
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'.
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;
}
ret++;
}
FcStrSetDestroy (subdirs);
- free (file);
continue;
}
if (stat ((char *) dir, &statb) == -1)
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 (FcDirCacheValid (dir) && 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);
{
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;
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;
void * current_dir_block;
off_t pos;
- read(fd, &metadata, sizeof(FcCache));
+ if (read(fd, &metadata, sizeof(FcCache)) != sizeof(FcCache))
+ return FcFalse;
if (metadata.magic != FC_CACHE_MAGIC)
return FcFalse;
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);
}