walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Read and write the original location as a fallback for the hashed cache 

file locations. This is mostly for users to be able to have
    per-directory cache files.
This commit is contained in:
Patrick Lam 2005-12-12 20:45:54 +00:00
parent 83b6739035
commit ec760b178a
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-12-12 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcDirCacheOpen, FcDirCacheWrite):
Read and write the original location as a fallback for the
hashed cache file locations. This is mostly for users to be
able to have per-directory cache files.
2005-12-12 Patrick Lam <plam@mit.edu> 2005-12-12 Patrick Lam <plam@mit.edu>
* fc-cache/fc-cache.c (scanDirs): * fc-cache/fc-cache.c (scanDirs):
* fc-cache/Makefile.am: * fc-cache/Makefile.am:

39
src/fccache.c
View File

@ -590,6 +590,9 @@ FcCacheCopyOld (int fd, int fd_orig, off_t start)
} }
/* Does not check that the cache has the appropriate arch section. */ /* Does not check that the cache has the appropriate arch section. */
/* Also, this can be fooled if the original location has a stale
* cache, and the hashed location has an up-to-date cache. Oh well,
* sucks to be you in that case! */
FcBool FcBool
FcDirCacheValid (const FcChar8 *dir) FcDirCacheValid (const FcChar8 *dir)
{ {
@ -840,6 +843,10 @@ FcDirCacheOpen (char *cache_file)
char *cache_hashed; char *cache_hashed;
char name_buf[FC_MAX_FILE_LEN]; char name_buf[FC_MAX_FILE_LEN];
fd = open(cache_file, O_RDONLY);
if (fd != -1)
return fd;
do do
{ {
cache_hashed = FcDirCacheHashName (cache_file, collisions++); cache_hashed = FcDirCacheHashName (cache_file, collisions++);
@ -992,7 +999,7 @@ FcBool
FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir) FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
{ {
char *cache_file; char *cache_file;
char *cache_hashed; char *cache_to_open;
int fd, fd_orig, i, dirs_count; int fd, fd_orig, i, dirs_count;
FcAtomic *atomic; FcAtomic *atomic;
FcCache metadata; FcCache metadata;
@ -1013,13 +1020,13 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
fd = -1; collisions = 0; fd = -1; collisions = 0;
do do
{ {
cache_hashed = FcDirCacheHashName (cache_file, collisions++); cache_to_open = FcDirCacheHashName (cache_file, collisions++);
if (!cache_hashed) if (!cache_to_open)
goto bail0; goto bail0;
if (fd > 0) if (fd > 0)
close (fd); close (fd);
fd = open(cache_hashed, O_RDONLY); fd = open(cache_to_open, O_RDONLY);
if (fd == -1) if (fd == -1)
break; break;
FcCacheReadString (fd, name_buf, sizeof (name_buf)); FcCacheReadString (fd, name_buf, sizeof (name_buf));
@ -1040,14 +1047,30 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
if (FcDebug () & FC_DBG_CACHE) if (FcDebug () & FC_DBG_CACHE)
printf ("FcDirCacheWriteDir cache_file \"%s\"\n", cache_file); printf ("FcDirCacheWriteDir cache_file \"%s\"\n", cache_file);
atomic = FcAtomicCreate ((FcChar8 *)cache_hashed); atomic = FcAtomicCreate ((FcChar8 *)cache_to_open);
if (!atomic) if (!atomic)
goto bail1; goto bail1;
if (!FcAtomicLock (atomic)) if (!FcAtomicLock (atomic))
goto bail2; {
/* Now try rewriting the original version of the file. */
FcAtomicDestroy (atomic);
fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY, 0666); atomic = FcAtomicCreate (cache_file);
fd_orig = open (cache_file, O_RDONLY);
if (fd_orig == -1)
fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY);
fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 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);
if (fd_orig == -1)
fd_orig = open((char *)FcAtomicOrigFile (atomic), O_RDONLY);
fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 0666); fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 0666);
if (fd == -1) if (fd == -1)
@ -1123,7 +1146,7 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
bail2: bail2:
FcAtomicDestroy (atomic); FcAtomicDestroy (atomic);
bail1: bail1:
free (cache_hashed); free (cache_to_open);
bail0: bail0:
unlink ((char *)cache_file); unlink ((char *)cache_file);
free (cache_file); free (cache_file);