Fix multi-arch cache files: compute the position for the block to be added

using info from OrigFile, not NewFile.
This commit is contained in:
Patrick Lam 2005-09-29 05:14:04 +00:00
parent cd3109114c
commit 649cc3616d
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-09-29 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheSave, FcDirCacheWrite):
Fix multi-arch cache files: compute the position for the
block to be added using info from OrigFile, not NewFile.
2005-09-28 Patrick Lam <plam@mit.edu> 2005-09-28 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcCacheMachineSignature): * src/fccache.c (FcCacheMachineSignature):

View File

@ -327,7 +327,7 @@ FcGlobalCacheSave (FcGlobalCache *cache,
current_arch_machine_name); current_arch_machine_name);
if (current_arch_start < 0) if (current_arch_start < 0)
current_arch_start = FcCacheNextOffset (lseek(fd, 0, SEEK_END)); current_arch_start = FcCacheNextOffset (lseek(fd_orig, 0, SEEK_END));
if (!FcCacheCopyOld(fd, fd_orig, current_arch_start)) if (!FcCacheCopyOld(fd, fd_orig, current_arch_start))
goto bail3; goto bail3;
@ -807,7 +807,7 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
FcCacheSkipToArch(fd_orig, current_arch_machine_name); FcCacheSkipToArch(fd_orig, current_arch_machine_name);
if (current_arch_start < 0) if (current_arch_start < 0)
current_arch_start = FcCacheNextOffset (lseek(fd, 0, SEEK_END)); current_arch_start = FcCacheNextOffset (lseek(fd_orig, 0, SEEK_END));
if (fd_orig != -1 && !FcCacheCopyOld(fd, fd_orig, current_arch_start)) if (fd_orig != -1 && !FcCacheCopyOld(fd, fd_orig, current_arch_start))
goto bail3; goto bail3;