if (cache->fd == -1)
return FcFalse;
- dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir);
+ 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)
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);
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;
}
truncate_to -= current_arch_start;
- FcCacheWriteString (fd, FC_GLOBAL_MAGIC_COOKIE);
sprintf (header, "%8x ", (int)truncate_to);
strcat (header, current_arch_machine_name);
if (!FcCacheWriteString (fd, header))
struct stat file_stat, dir_stat;
int fd;
+ dir = FcConfigNormalizeFontDir (FcConfigGetCurrent(), dir);
+ if (!dir)
+ return FcFalse;
+
if (stat ((char *) dir, &dir_stat) < 0)
return FcFalse;
off_t current_arch_start;
char *current_arch_machine_name;
+ dir = FcConfigNormalizeFontDir (FcConfigGetCurrent(), dir);
+ if (!dir)
+ return FcFalse;
+
fd = FcDirCacheOpen (dir);
if (fd < 0)
goto bail;
FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
{
char *cache_file;
- char *cache_hashed;
+ char *cache_hashed = 0;
int fd, collisions;
struct stat cache_stat;
char name_buf[FC_MAX_FILE_LEN];
fd = -1; collisions = 0;
do
{
+ if (cache_hashed)
+ FcStrFree ((FcChar8 *)cache_hashed);
+
cache_hashed = FcDirCacheHashName (cache_file, collisions++);
if (!cache_hashed)
goto bail;
FcCacheReadString (fd, name_buf, sizeof (name_buf));
if (!strlen(name_buf))
+ {
+ FcStrFree ((FcChar8 *)cache_hashed);
goto bail;
+ }
} while (strcmp (name_buf, cache_file) != 0);
FcStrFree ((FcChar8 *)cache_file);
cache_hashed = FcDirCacheHashName (cache_file, collisions++);
if (!cache_hashed)
+ {
+ FcStrFree ((FcChar8 *)cache_file);
return -1;
+ }
if (fd > 0)
close (fd);
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;
continue;
}
FcStrFree (name_buf_dir);
- found = c.st_ino == dir_stat.st_ino;
+ 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;
}
FcCacheSkipToArch(fd_orig, 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 (fd_orig != -1 && !FcCacheCopyOld(fd, fd_orig, current_arch_start))
goto bail4;
if (ftruncate (fd, current_arch_start + truncate_to) == -1)
goto bail5;
+ free (header);
close(fd);
if (!FcAtomicReplaceOrig(atomic))
goto bail5;
FcStrFree ((FcChar8 *)cache_hashed);
+ FcStrFree ((FcChar8 *)cache_file);
FcAtomicUnlock (atomic);
FcAtomicDestroy (atomic);
return FcTrue;
FcStrFree ((FcChar8 *)cache_hashed);
bail0:
unlink ((char *)cache_file);
- free (cache_file);
+ FcStrFree ((FcChar8 *)cache_file);
if (current_dir_block)
free (current_dir_block);
bail: