#include <unistd.h>
#define ENDIAN_TEST 0x12345678
-#define MACHINE_SIGNATURE_SIZE 9 + 5*20 + 1
+#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1)
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
static int
FcDirCacheOpen (const FcChar8 * dir);
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
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;
- FcCacheReadString (cache->fd, name_buf, sizeof (name_buf));
+ if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)))
+ 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,
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;
{
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
(config_time.set && cache_stat.st_mtime < config_time.time))
{
FcCache md;
+ off_t off;
+
+ FcStrSetAdd (staleDirs, FcStrCopy ((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));
d->name = (char *)FcStrCopy ((FcChar8 *)name_buf);
d->ent = 0;
- d->offset = lseek (cache->fd, 0, SEEK_CUR);
+ d->state = FcGCDirFileRead;
d->subdirs = FcStrSetCreate();
- while (strlen(FcCacheReadString (cache->fd, subdirName, sizeof (subdirName))) > 0)
+ 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;
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;
const FcChar8 *cache_file,
FcConfig *config)
{
- int fd, fd_orig, i;
+ int fd, fd_orig;
FcGlobalCacheDir *dir;
FcAtomic *atomic;
off_t current_arch_start = 0, truncate_to;
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)
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)
{
+ int i;
+
+ 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);
+ int i;
+ const char * d;
+ off_t off;
- FcCacheWriteString (fd, d);
-
- 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;
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;
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
loc = 0;
lseek (fd, 0, SEEK_SET); lseek (fd_orig, 0, SEEK_SET);
+ FcCacheSkipString (fd); FcCacheSkipString (fd_orig);
do
{
int b = 8192;
fd = FcDirCacheOpen (dir);
if (fd < 0)
- goto bail;
+ return FcFalse;
if (fstat (fd, &file_stat) < 0)
goto bail;
int fd;
off_t current_arch_start;
char *current_arch_machine_name;
+ FcCache metadata;
+ char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1];
fd = FcDirCacheOpen (dir);
if (fd < 0)
current_arch_machine_name = FcCacheMachineSignature();
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)
return FcTrue;
+ bail1:
+ close (fd);
bail:
return FcFalse;
}
return FcFalse;
/* First remove normal cache file. */
- if (stat ((char *) cache_file, &cache_stat) == 0 &&
- unlink ((char *)cache_file) != 0)
- goto bail;
+ if (stat ((char *) cache_file, &cache_stat) == 0)
+ unlink ((char *)cache_file);
/* Next remove any applicable hashed files. */
fd = -1; collisions = 0;
if (fd > 0)
close (fd);
- fd = open(cache_hashed, O_RDONLY);
+ fd = open(cache_hashed, O_RDONLY | O_BINARY);
if (fd == -1)
{
FcStrFree ((FcChar8 *)cache_file);
return FcTrue;
}
- FcCacheReadString (fd, name_buf, sizeof (name_buf));
- if (!strlen(name_buf))
+ 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 &&
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) &&
+ FcDirCacheHasCurrentArch (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;
char name_buf[FC_MAX_FILE_LEN];
struct stat dir_stat;
- cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
- if (!cache_file)
+ if (stat ((char *)dir, &dir_stat) == -1)
return -1;
- fd = open(cache_file, O_RDONLY);
- if (fd != -1)
- return fd;
-
- if (stat ((char *)dir, &dir_stat) == -1)
+ cache_file = (char *)FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
+ if (!cache_file)
return -1;
found = FcFalse;
do
{
- struct stat c;
- FcChar8 * name_buf_dir;
+ struct stat c;
+ FcChar8 *name_buf_dir;
+
+ if (fd >= 0)
+ close (fd);
cache_hashed = FcDirCacheHashName (cache_file, collisions++);
if (!cache_hashed)
return -1;
}
- if (fd > 0)
- close (fd);
- fd = open(cache_hashed, O_RDONLY);
+ fd = open(cache_hashed, O_RDONLY | O_BINARY);
FcStrFree ((FcChar8 *)cache_hashed);
if (fd == -1)
- {
- FcStrFree ((FcChar8 *)cache_file);
- return -1;
- }
- FcCacheReadString (fd, name_buf, sizeof (name_buf));
- if (!strlen(name_buf))
- goto bail;
+ break;
+ if (!FcCacheReadString (fd, name_buf, sizeof (name_buf)) ||
+ !strlen(name_buf))
+ break;
name_buf_dir = FcStrDirname ((FcChar8 *)name_buf);
if (stat ((char *)name_buf_dir, &c) == -1)
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:
+ if (!found || fd < 0)
+ {
+ if (fd >= 0)
+ close (fd);
+ fd = open(cache_file, O_RDONLY | O_BINARY);
+ }
+
FcStrFree ((FcChar8 *)cache_file);
- close (fd);
- return -1;
+ return fd;
}
/* read serialized state from the cache file */
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, config))
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;
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);
if (fd > 0)
close (fd);
- fd = open(cache_hashed, O_RDONLY);
+ fd = open(cache_hashed, O_RDONLY | O_BINARY);
if (fd == -1)
break;
- FcCacheReadString (fd, name_buf, sizeof (name_buf));
+ if(!FcCacheReadString (fd, name_buf, sizeof (name_buf)) || !strlen(name_buf))
+ {
+ close (fd);
+ continue;
+ }
close (fd);
- if (!strlen(name_buf))
- break;
-
if (strcmp (name_buf, cache_file) != 0)
continue;
- } while (0);
+
+ break;
+ } while (1);
current_dir_block = FcDirCacheProduce (set, &metadata);
FcAtomicDestroy (atomic);
atomic = FcAtomicCreate ((FcChar8 *)cache_file);
- fd_orig = open (cache_file, O_RDONLY);
+ fd_orig = open (cache_file, O_RDONLY | O_BINARY);
if (fd_orig == -1)
- fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY);
+ 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 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);
+ fd_orig = open (cache_file, O_RDONLY | O_BINARY);
if (fd_orig == -1)
- fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY);
+ 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;
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);
+ 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))
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 */
git.wh0rd.org / fontconfig.git / blobdiff