* PERFORMANCE OF THIS SOFTWARE.
*/
+#include "fcint.h"
#include <fcntl.h>
#include <dirent.h>
#include <string.h>
-#include <sys/mman.h>
-#include <sys/utsname.h>
#include <sys/types.h>
-#include <unistd.h>
-#include "fcint.h"
-#include <unistd.h>
+#if defined(HAVE_MMAP) || defined(__CYGWIN__)
+# include <unistd.h>
+# include <sys/mman.h>
+#elif defined(_WIN32)
+# include <windows.h>
+#endif
#define ENDIAN_TEST 0x12345678
-#define MACHINE_SIGNATURE_SIZE 9 + 5*20 + 1
+#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1)
+/* for when we don't have sysconf: */
+#define FC_HARDCODED_PAGESIZE 8192
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
static int
FcDirCacheOpen (const FcChar8 * dir);
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;
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);
if (!FcCacheReadString (cache->fd, candidate_arch_machine_name,
FcCache md;
off_t off;
- FcStrSetAdd (staleDirs, FcStrCopy ((FcChar8 *)name_buf));
+ FcStrSetAdd (staleDirs, (FcChar8 *)name_buf);
/* skip subdirs */
while (FcCacheReadString (cache->fd, subdirName,
if (cache->fd == -1)
return FcFalse;
- if (!(dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir)))
- return FcFalse; /* non-existing directory */
+ if (config)
+ if (!(dir = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)dir)))
+ return FcFalse; /* non-existing directory */
for (d = cache->dirs; d; d = d->next)
{
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)
goto bail3;
current_arch_start = lseek(fd, 0, SEEK_CUR);
+#if defined (HAVE_FTRUNCATE)
if (ftruncate (fd, current_arch_start) == -1)
goto bail3;
+#else
+#if defined (HAVE_CHSIZE)
+ if (chsize (fd, current_arch_start) == -1)
+ goto bail3;
+#else
+ goto bail3;
+#endif
+#endif
header = malloc (10 + strlen (current_arch_machine_name));
if (!header)
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;
if (!FcCacheWriteString (fd, header))
goto bail4;
+ free (header);
+
for (dir = cache->dirs; dir; dir = dir->next)
{
+ int i;
const char * d;
off_t off;
FcCacheNextOffset(off_t w)
{
static long pagesize = -1;
+
+ if (w == -1)
+ return w;
+
if (pagesize == -1)
+#if defined (HAVE_SYSCONF)
pagesize = sysconf(_SC_PAGESIZE);
+#else
+ pagesize = FC_HARDCODED_PAGESIZE;
+#endif
if (w % pagesize == 0)
return w;
else
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_hashed);
FcStrFree ((FcChar8 *)cache_file);
return FcTrue;
}
{
int ret = 0;
FcChar8 *dir;
- const FcChar8 *name;
FcStrSet *subdirs;
FcStrList *sublist;
struct stat statb;
/* 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.
*/
- name = FcConfigNormalizeFontDir (config, dir);
- if (name)
- {
- if (FcStrSetMember (processed_dirs, dir))
- continue;
- FcStrSetAdd (processed_dirs, dir);
- }
+ dir = (FcChar8 *)FcConfigNormalizeFontDir (config, dir);
+ if (!dir)
+ continue;
+
+ if (FcStrSetMember (processed_dirs, dir))
+ continue;
+ if (!FcStrSetAdd (processed_dirs, dir))
+ continue;
subdirs = FcStrSetCreate ();
if (!subdirs)
FcStrSetDestroy (subdirs);
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 *)name)) != NULL)
+ if ((d = FcGlobalCacheDirFind (cache, (const char *)dir)) != NULL)
{
d->state = FcGCDirDisabled;
/* save the updated config later without this entry */
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;
- }
- if (!FcCacheReadString (fd, name_buf, sizeof (name_buf)) || !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 */
{
FcCache metadata;
void * current_dir_block;
- off_t pos;
+ off_t pos, endpos;
if (read(fd, &metadata, sizeof(FcCache)) != sizeof(FcCache))
return FcFalse;
}
pos = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR));
+
+ /* This is not failsafe (multi-arches can break it),
+ * but fd has got to have at least as many bytes as
+ * metadata.count, or something's going to go horribly wrong. */
+ if (pos == (off_t)-1)
+ return FcFalse;
+
+ endpos = lseek (fd, 0, SEEK_END);
+ if (endpos == (off_t)-1 || endpos - pos < metadata.count)
+ return FcFalse;
+ if (lseek (fd, pos, SEEK_SET) == -1)
+ return FcFalse;
+
+#if defined(HAVE_MMAP) || defined(__CYGWIN__)
current_dir_block = mmap (0, metadata.count,
PROT_READ, MAP_SHARED, fd, pos);
- lseek (fd, pos+metadata.count, SEEK_SET);
if (current_dir_block == MAP_FAILED)
return FcFalse;
+#elif defined(_WIN32)
+ {
+ HANDLE hFileMap;
+
+ hFileMap = CreateFileMapping((HANDLE) _get_osfhandle(fd), NULL, PAGE_READONLY, 0, 0, NULL);
+ if (hFileMap == NULL)
+ return FcFalse;
+
+ current_dir_block = MapViewOfFile (hFileMap, FILE_MAP_READ, 0, 0, metadata.count + pos);
+ if (current_dir_block == NULL)
+ {
+ CloseHandle (hFileMap);
+ return FcFalse;
+ }
+
+ current_dir_block = (void *)((char *)current_dir_block + pos);
+ }
+#else
+ current_dir_block = malloc (metadata.count);
+ if (!current_dir_block)
+ return FcFalse;
+
+ /* could also use CreateMappedViewOfFile under MinGW... */
+ if (read (fd, current_dir_block, metadata.count) != metadata.count)
+ goto bail;
+#endif
+ lseek (fd, pos+metadata.count, SEEK_SET);
FcCacheAddBankDir (metadata.bank, dir);
if (config)
FcConfigAddFontDir (config, (FcChar8 *)dir);
if (!FcFontSetUnserialize (&metadata, set, current_dir_block))
- return FcFalse;
+ goto bail;
return FcTrue;
+ bail:
+#if !(defined(HAVE_MMAP) || defined(__CYGWIN__))
+ free (current_dir_block);
+#endif
+ return FcFalse;
}
static void *
static unsigned int rand_state = 0;
int bank, needed_bytes_no_align;
+#if defined (HAVE_RAND_R)
if (!rand_state)
rand_state = time(0L);
bank = rand_r(&rand_state);
while (FcCacheHaveBank(bank))
bank = rand_r(&rand_state);
+#else
+ if (!rand_state)
+ {
+ rand_state = 1;
+ srand (time (0L));
+ }
+ bank = rand();
+
+ while (FcCacheHaveBank(bank))
+ bank = rand();
+#endif
memset (metadata, 0, sizeof(FcCache));
FcFontSetNewBank();
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;
if(!FcCacheReadString (fd, name_buf, sizeof (name_buf)) || !strlen(name_buf))
{
close (fd);
- break;
+ FcStrFree ((FcChar8 *)cache_hashed);
+ continue;
}
close (fd);
- if (strcmp (name_buf, cache_file) != 0)
+ if (strcmp (name_buf, cache_file) != 0)
+ {
+ FcStrFree ((FcChar8 *)cache_hashed);
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))
close (fd_orig);
current_arch_start = lseek(fd, 0, SEEK_CUR);
+#if defined (HAVE_FTRUNCATE)
if (ftruncate (fd, current_arch_start) == -1)
goto bail4;
+#else
+#if defined (HAVE_CHSIZE)
+ if (chsize (fd, current_arch_start) == -1)
+ goto bail4;
+#else
+ goto bail4;
+#endif
+#endif
/* allocate space for subdir names in this block */
dirs_count = 0;
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 */
+#if defined (HAVE_FTRUNCATE)
if (ftruncate (fd, current_arch_start + truncate_to) == -1)
goto bail5;
+#else
+#if defined (HAVE_CHSIZE)
+ if (chsize (fd, current_arch_start + truncate_to) == -1)
+ goto bail5;
+#else
+ goto bail5;
+#endif
+#endif
free (header);
close(fd);
if (!FcAtomicReplaceOrig(atomic))
- goto bail5;
+ goto bail3;
FcStrFree ((FcChar8 *)cache_hashed);
FcStrFree ((FcChar8 *)cache_file);
FcAtomicUnlock (atomic);
(unsigned int)sizeof (FcCharLeaf),
(unsigned int)sizeof (FcChar32),
(unsigned int)sizeof (FcCache),
+#if defined (HAVE_SYSCONF)
(unsigned int)sysconf(_SC_PAGESIZE));
+#else
+ (unsigned int)FC_HARDCODED_PAGESIZE);
+#endif
return buf;
}
git.wh0rd.org / fontconfig.git / blobdiff