18b6857c64
Fix fc-lang to use new charset freezer API.
...
Charset freezer api now uses allocated object. Also required minor fixes to
charset freezer code to remove assumption that all input charsets are
persistant.
2006-09-01 01:49:47 -07:00
bc5e487f2a
Pass directory information around in FcCache structure. Freeze charsets.
...
Instead of passing directory information around in separate variables,
collect it all in an FcCache structure. Numerous internal and tool
interfaces changed as a result of this.
Charsets are now pre-frozen before being serialized. This causes them to
share across multiple fonts in the same cache.
2006-09-01 01:15:14 -07:00
551b6b2cd7
Allow FcTypeLangSet to match either FcTypeLangSet or FcTypeString.
...
Applications explicitly setting FC_LANG with string would fail due
to typechecking disallowing this case.
2006-08-31 18:16:00 -07:00
f57783d2e9
Revert ABI changes from version 2.3
...
Accidental ABI changes and additions were discovered by looking at the
differences in fontconfig.h. All of those have been reverted.
2006-08-31 14:38:18 -07:00
0a87ce715e
With no args, fc-cat now dumps all directories.
...
Automatically list all font directories when no arguments are given to
fc-cat. Also add -r option to recurse from specified cache directories.
fc-cat also now prints the cache filename in verbose mode, along with the
related directory name.
2006-08-31 11:56:43 -07:00
d8ab9e6c42
Automatically remove invalid cache files.
...
Cache files for missing or more recently modified directories are
automatically removed at the end of every fc-cache run.
2006-08-31 09:42:49 -07:00
e9a564e2cd
Serialized value lists were only including one value.
...
The next pointer in the serialized value list wasn't getting set, so they
were truncated at a single value.
2006-08-31 09:07:32 -07:00
c50ea916b0
Use intptr_t instead of off_t inside FcCache structure.
...
This avoids OS-dependencies in the cache file structure.
2006-08-30 23:09:39 -07:00
76abb77f26
Fix fc-cat again. Sigh.
...
Internal interfaces in cache management changed again...
2006-08-30 22:23:25 -07:00
2d3387fd72
Skip broken caches. Cache files are auto-written, don't rewrite in fc-cache.
...
Validate cache contents and skip broken caches, looking down cache path for
valid ones.
Every time a directory is scanned, it will be written to a cache file if
possible, so fc-cache doesn't need to re-write the cache file. This makes
detecting when the cache was generated a bit tricky, so we guess that if the
cache wasn't valid before running and is valid afterwards, the cache file
was written.
Also, allow empty charsets to be serialized with null leaves/numbers.
Eliminate a leak in FcEdit by switching to FcObject sooner.
Call FcFini from fc-match to make valgrind happy.
2006-08-30 21:59:53 -07:00
09f9f6f62a
Rework Object name database to unify typechecking and object lookup.
...
Eliminate ancient list of object name databases and load names into single
hash table that includes type information. Typecheck all pattern values to
avoid mis-typed pattern elements.
2006-08-30 18:50:58 -07:00
c02886485b
FcCharSetSerialize was using wrong offset for leaves. Make fc-cat work.
...
FcCharSetSerialize was computing the offset to the unserialized leaf,
which left it pointing at random data when the cache was reloaded.
fc-cat has been updated to work with the new cache structure.
Various debug messages extended to help diagnose serialization errors.
2006-08-30 13:51:03 -07:00
e3096d90fd
Fix build problems caused by cache rework.
...
Pagesize no longer matters in architecture decisions, the entire cache file
is mmaped into the library. However, lots of intptr_t values are in use now,
so that value is important.
fc-lang now requires fcserialize.c, which has been added to the repository.
2006-08-30 04:24:03 -07:00
7ce1967331
Rework cache files to use offsets for all data structures.
...
Replace all of the bank/id pairs with simple offsets, recode several
data structures to always use offsets inside the library to avoid
conditional paths. Exposed data structures use pointers to hold offsets,
setting the low bit to distinguish between offset and pointer.
Use offset-based data structures for lang charset encodings; eliminates
separate data structure format for that file.
Much testing will be needed; offsets are likely not detected everywhere in
the library yet.
2006-08-30 04:16:22 -07:00
2a9179d889
Revert to original FcFontSetMatch algorithm to avoid losing fonts.
...
The fancy new FcFontSetMatch algorithm would discard fonts for the
wrong reasons; fc-match sans:lang=en,ja would discard all fonts without
Japanese support. This commit reverts to the original algorithm which
ensure that FcFontSetMatch always matches the first font in the
FcFontSetSort return list.
2006-08-28 11:51:12 -07:00
7db39f7298
Regenerate x86 line in fcarch.tmpl.h to match change in cache data.
...
Also remove spurious printf of directory names.
2006-08-28 09:43:12 -07:00
0d9e31c810
Eliminate ./ and ../ elements from font directory names when scanning.
...
FcStrCanonFilename eliminates ./ and ../ elements from pathnames through
simple string editing. Also, relative path names are fixed by prepending the
current working directory.
2006-08-27 23:40:51 -07:00
af180c4037
Fix up fc-cache and fc-cat for no global cache changes.
...
fc-cache and fc-cat use internal (fcint.h) APIs that have
changed with the elimination of the global cache.
2006-08-27 22:24:39 -07:00
00f059e930
Eliminate global cache. Eliminate multi-arch cache code.
...
With the removal of the in-directory cache files, and the addition of
per-user cache directories, there is no longer any reason to preserve the
giant global cache file. Eliminating of this unifies the cache structure
and simplifies the overall caching strategies greatly.
2006-08-27 21:53:48 -07:00
cf65c0557e
Add architecture to cache filename.
...
Make cache filenames unique by inserting the architecture name into the
filename.
2006-08-27 18:29:51 -07:00
db50cbdaf5
Eliminate NormalizeDir. Eliminate gratuitous stat/access calls per dir.
...
Normalized directory names offer protection against looped directory trees
but cost enormous numbers of system calls (stat per file in the hierarchy).
Also, cache file directory name contents are validated each time the
directory is modified, don't re-validate every time the cache file is loaded
with an access and stat call.
2006-08-27 18:19:39 -07:00
d2f786849c
Write caches to first directory with permission. Valid cache in FcDirCacheOpen.
...
Previous policy was to attempt to update the cache in place and bail if that
didn't work. Now, search for the first writable directory and place the
cache file there instead. Furthermore, on startup, search directory list for
valid cache files instead of bailing if the first found cache file wasn't
valid.
2006-08-27 17:04:01 -07:00
7410e40bd9
2006-08-04 Keith Packard (keithp@keithp.com) reviewed by: plam
...
Make cache directories configurable. Simplify and correct some code which
deals with per-directory caches.
2006-08-04 16:13:00 +00:00
62a4a8459a
2006-07-19 Jon Burgess (jburgess@uklinux.net) reviewed by: plam
...
Fix file-descriptor leak in FcGlobalCacheDestroy.
2006-07-19 02:14:28 +00:00
1c14f2d963
2006-05-31 Yong Li (rigel863@gmail.com) reviewed by: plam, Bedhad Esfahbod
...
TrueType Collection table offsets are absolute, not relative.
2006-06-02 18:48:30 +00:00
31b7e6d7f5
2006-04-27 Paolo Borelli (pborelli@katamail.com) reviewed by: plam
...
Make FcStrCopy slightly more efficient.
2006-04-28 07:00:25 +00:00
0037aad501
Keith Packard <keithp@keithp.com>
...
Reduce transient memory usage during config file parsing by allocating
smaller buffers (64 seems to be a magic number).
2006-04-27 08:13:45 +00:00
529291bef4
Eliminate pattern freezing
2006-04-27 07:54:07 +00:00
c1c3ba06d5
Make path names in cache files absolute (NB, cache format change) Stop
...
permitting cache files to be stored in font dirs. Bump cache magic.
Don't include /fonts.cache-2 in cache hash construction.
reviewed by: Patrick Lam <plam@mit.edu>
2006-04-27 07:11:44 +00:00
73775d8f28
Fix the issues with GNU libiconv vs. libc iconv (which especially appear on
...
Solarii). Approach suggested by Tim Mooney.
reviewed by: plam
2006-04-25 15:33:07 +00:00
f045376c08
Include $(top_srcdir), $(top_srcdir)/src before anything else.
...
Shuffle order of includes for building out of srcdir on win32.
reviewed by: plam
2006-04-25 05:57:41 +00:00
55e145b025
Prevent terrible perf regression by getting the if-condition right
...
(reported by Wouter Bolsterlee).
2006-04-20 16:57:50 +00:00
93f67dfc73
Dominic Lachowicz <cinamod@hotmail.com>
...
Implement mmap-like code for Windows using MapViewOfFile.
2006-04-19 16:53:50 +00:00
c001a192af
Bail gracefully if the cache file does not contain enough data.
2006-04-19 16:17:19 +00:00
8cfa0bbc82
Fix Gecko-exposed segfault from my last hack to FcObjectToPtrLookup.
...
Simplify code and get things straight.
2006-04-14 18:35:16 +00:00
2f02e38361
Fix memory leak (Coverity defect #2089 ).
...
Ignore script if subtable is missing (Coverity defect #2088 ).
Fix possible null pointer dereference (Coverity defect #784 ) and memory
leak (Coverity defects #785 , #786 ).
Don't copy FcCharSet if we're going to throw it away anyway. (Reported by
Kenichi Handa).
reviewed by: plam
2006-04-12 14:36:36 +00:00
a56e89ab4f
Fix bad behaviour on realloc resulting in crash.
...
reviewed by: plam
2006-04-12 03:02:57 +00:00
5c90509c07
Don't crash if config is null (Coverity defect #984 ).
2006-04-12 02:38:28 +00:00
2de24638b2
Missing bits from previous patches.
...
Remove extra semi-colon.
Fix memory leak in error case (Coverity defects #776 , #985 ).
Fix memory leaks (Coverity defects #779 , #781 ) and memory use after free
(Coverity defect #780 ).
reviewed by: plam
2006-04-11 16:54:24 +00:00
04f7d3e7fd
Properly convert static charsets to dynamic charsets.
...
Fix memory leak in error case (Coverity defects #1820 , #1821 , #1822 ).
Fix memory leak (Coverity defect #1819 ).
prevent crash when invalid include line is parsed (Coverity defect #763 ).
Fix potential null pointer access (Coverity defect #1804 ).
Remove dead code (Coverity defect #1194 ).
Prevent potential null pointer access (Coverity defect #767 ), ensure error
value is read (Coverity defect #1195 ).
reviewed by: plam
2006-04-11 14:20:59 +00:00
ac0010940e
Swap typo in order of ALIGN and dereferencing, fixing bug 6529.
2006-04-10 21:04:54 +00:00
3ea92166a0
Fix string memory leak (Coverity defect #1823 ).
...
Fix memory leak with hash collision (Coverity defect #1824 ).
reviewed by: plam
2006-04-10 19:33:03 +00:00
c814c301ee
Don't leak header in non-error case (Coverity defect #1825 ).
...
reviewed by: plam
2006-04-10 16:12:55 +00:00
65448e8b2a
src/fcdir.c (FcDirScanConfig) Don't leak in error cases (Coverity defects
...
#777 , #1826 )
reviewed by: plam
2006-04-10 16:06:42 +00:00
ae2aafe602
Fix double free (spotted by Coverity, CID #1965 ).
...
Check if pattern is not null before using it (Coverity defect #1883 ).
Fix memory leak with hash collision (Coverity defect #1829 ).
Fix memory leak when bail cases (Coverity defect #1828 ).
Don't leak directory name (Coverity defect #1827 ).
reviewed by: plam
2006-04-10 15:46:34 +00:00
f23f5f388d
SGI compilation fixes (reported by Christoph Bauer):
...
1) reorder union definition of _FcChar;
2) omit .stats =.
2006-04-07 17:37:09 +00:00
44415a079a
Portability fixes for HP-UX (reported by Christoph Bauer). Replace
...
'__inline__' by AC_C_INLINE and 'inline'. Replace '__alignof__' by
'fc_alignof'.
reviewed by: plam
2006-04-07 17:27:39 +00:00
91fe51b4f8
Move up #include of config.h. Fail if neither inttypes.h nor stdint.h is
...
available. Fixes bug 6171.
reviewed by: plam
2006-04-07 17:06:55 +00:00
d6217cc6bc
Patrick Lam <plam@mit.edu>
...
Make fontconfig compile under MinGW:
1) remove unneeded #includes;
2) make use of mmap and sysconf conditional;
3) replace rand_r by srand/rand if needed;
4) use chsize instead of ftruncate; and
5) update libtool exports file
2006-04-07 04:42:32 +00:00
3a342c5a6c
Eliminate warning.
2006-04-07 04:19:49 +00:00
392fa276dc
Reduce amount of dirty rss by const'ing some data structures.
...
Don't fail if we can't create or remove $(pkgcachedir) i.e.
/var/cache/fontconfig. (reported by Quanah Gibson-Mount).
reviewed by: plam
2006-04-06 04:52:21 +00:00
0d745819a9
Fix intel compiler warnings: make many variables static, eliminate
...
duplicate names, reduce variable scopes, unsigned/signed printf
formatting.
reviewed by: plam
2006-04-06 04:33:11 +00:00
b17cf498be
Fix multiarch support (don't destroy multiarch files!)
...
Require pkg-config. (Thanks Behdad; better solution wanted for libxml2
detection!)
reviewed by: plam
2006-03-24 15:21:10 +00:00
c022182231
On Windows, unlink before rename. Reported by Tim Evans.
2006-03-23 04:21:10 +00:00
e3c6d3364c
Sort directory entries while scanning them from disk; prevents Heisenbugs
...
due to file ordering in a directory.
reviewed by: plam
2006-03-08 19:10:57 +00:00
d8951c0cc2
Remove stuff we don't use, make get_{char,short,long} functions of ftglue
...
macros to be inlined.
Code cleanups (excess prototype, old-style function definition).
reviewed by: plam
2006-03-08 02:30:43 +00:00
9226e04c69
Because we hacked FcPatternGet, we don't really need to expand the filename
...
again in FcPatternGetString.
2006-03-05 15:33:46 +00:00
618adbaf7b
Ok, so some people (wine!) use FcPatternGet to fetch FC_FILE. Make that
...
work. Reported by Bernhard Rosenkraenzer.
2006-03-05 06:05:50 +00:00
dc70c15aba
Include inttypes.h instead of stdint.h if appropriate.
2006-03-03 18:35:42 +00:00
bb6b19938e
Get rid of C++-style comments.
2006-03-03 06:35:53 +00:00
b36f2a39d0
Fix suspicious return expression which causes junk to be returned.
...
reviewed by: plam
2006-03-03 06:11:31 +00:00
0cfaf27e33
Takashi Iwai <tiwai@suse.de> reviewed by: plam
...
Fix double-free on error case.
2006-02-24 16:41:34 +00:00
656b47f698
Pass the buck; make fontconfig not crash on pango badness.
2006-02-21 15:56:41 +00:00
f2fb985c7a
Eliminate redundancies.
...
reviewed by: plam
2006-02-21 15:50:19 +00:00
b023dbd384
Eliminate unused vars reported by Intel's compiler.
...
reviewed by: plam
2006-02-21 15:40:18 +00:00
dacf81ed4c
Freeze patterns created by configuration file for tiny memory savings
...
(every little bit helps).
reviewed by: plam, keithp
2006-02-21 15:24:28 +00:00
530e66b008
Fix the underlying cause of the below segfault (must usually call
...
FcDirCacheHasCurrentArch after FcDirCacheValid).
2006-02-18 18:18:07 +00:00
a68ce9525d
Fix segfault (reported by fcrozat) caused by incorrect input on cache
...
files.
2006-02-18 17:56:25 +00:00
310817371c
Bump up magic version; we changed the binary format.
2006-02-17 14:44:42 +00:00
8c0d692125
Deal correctly with changing FC_CACHE_MAGIC.
2006-02-16 17:50:04 +00:00
719f4b841f
Don't bail if fontconfig can't remove a dir cache file. Skip the ID of a
...
cache file when copying. Eliminate 'source file too small' bug in
FcDirCacheWrite.
2006-02-16 07:12:04 +00:00
f8a17f3298
Fix memory leak in error condition code.
2006-02-13 22:19:30 +00:00
5657098e29
Skip bitmap fonts which can't even get it together enough to declare a
...
family name; this appears to reproduce previous fontconfig behaviour.
reviewed by: plam
2006-02-13 21:51:11 +00:00
d00c3cb5e0
Try to open /var/cache/fontconfig/[hashed name] before fonts.cache-2 in a
...
directory, because /var/cache/fontconfig failures ought to be fixable,
unlike fonts.cache-2 failures, which may leave you screwed.
reviewed by: plam
2006-02-11 05:01:32 +00:00
9e07e0a77b
Use a tri-state to mark the fonts which didn't get blocked but were just
...
missing an element, to distinguish them from the fonts that do match
the element.
reviewed by: plam
2006-02-11 04:50:46 +00:00
f11a184104
Don't kill fonts because they don't declare an element that's being matched
...
on.
reviewed by: plam
2006-02-10 19:40:11 +00:00
879af7060b
Define and pass O_BINARY to open if appropriate, for those platforms that
...
need it. Reported by Doodle.
2006-02-09 18:44:14 +00:00
c7490074c5
Fix attempt to close -1. Don't unboundedly grow bad caches (reported by
...
fcrozat).
2006-02-09 16:19:42 +00:00
a8c425301a
Fix problem with missing 'en' due to euro.patch: change cache file format
...
slightly to coincide with that generated by fc-lang.
2006-02-09 15:25:57 +00:00
b10e77628c
Fix warning.
2006-02-08 03:34:17 +00:00
5c3deb2985
Don't reject dirs that can't be normalized (fixes lilypond, and is correct
...
in the context of application font directories.)
Use normalized directory name exclusively in FcCacheReadDirs.
reviewed by: plam
2006-02-07 22:09:01 +00:00
efb11b36c4
Perf optimizations. Inline FcValueCanonicalize, reduce FcValueListPtrU
...
usage, remove redundant cast.
reviewed by: plam
2006-02-07 21:15:33 +00:00
6cc02fe6b9
src/fccharset.c (FcLangCharSetPopulate, FcCharSetInsertLeaf)
...
Fix missing FcCacheBankToIndex in FcCharSetInsertLeaf. Declare extern for
static arrays as arrays, not pointers. (Part of the fix for 'fonts
don't have en' issue after Euro patch.)
(I forgot to commit the ChangeLog last time.)
reviewed by: plam
2006-02-07 20:56:48 +00:00
a81f23c0ce
Fix hidden variable warning.
2006-02-07 03:53:32 +00:00
799157dbbf
Remove de-escaping logic because FcCacheWriteString doesn't escape anyway.
...
Do blockwise reading instead of byte-wise for performance.
2006-02-07 02:33:57 +00:00
8b413bb62c
Takashi Iwai <tiwai@suse.de>
...
Don't loop infinitely on recursive symlinks (client-side).
2006-02-07 02:22:50 +00:00
fff5a5af30
Skip subdirs when skipping over stale bits of global cache. Introduce state
...
machine into FcGlobalCacheDir to avoid doing inappropriate operations
on global dir entries, e.g. writing out an out-of-date cache entry.
reviewed by: plam
2006-02-06 22:44:02 +00:00
98592bbb1d
Hoist FcFileIsDir check out of FcFileScanConfig loop.
...
reviewed by: plam
2006-02-06 21:52:15 +00:00
a0aa54f6ee
Don't rescan when trying to normalize a non-declared font dir. Don't add
...
font dirs multiple times (even if they're aliased).
reviewed by: plam
2006-02-06 19:25:45 +00:00
86e75dfb5d
Explain apples/oranges comparison and fix compilation error.
...
reviewed by: plam
2006-02-06 14:44:46 +00:00
f076169d19
Insert check for integer overflow in # of fonts.
...
reviewed by: plam
2006-02-06 14:14:21 +00:00
68355f3877
src/fccache.c (FcGlobalCacheLoad, FcGlobalCacheSave, FcDirCacheConsume,
...
FcDirCacheWrite)
Check I/O call return values and eliminate unused variable warnings.
reviewed by: plam
2006-02-05 02:57:21 +00:00
c4c47a7654
src/fccfg.c (FcConfigAppFontAddFile, FcConfigAppFontAddDir)
...
Fix memory leak.
reviewed by: plam
2006-02-04 00:09:42 +00:00
a8e4d9eb39
Gracefully handle the case where a cache asserts that it has a negative
...
number of fonts, causing overflow.
reviewed by: plam
2006-02-04 00:04:00 +00:00
1af0f5741a
Fix double free in error case.
2006-02-03 23:47:37 +00:00
28aefd013d
Toast broken global cache files.
...
reviewed by: plam
2006-01-31 07:16:22 +00:00
3616cbe251
Actually use the directories that I added to the global cache. Fixes 'make
...
check'.
2006-01-31 04:42:20 +00:00
81d97094cf
Make global cache work again after putting dir names into global cache (I
...
misplaced the recording of a file offset).
2006-01-30 16:31:56 +00:00
2c4e012497
Update fc-cat to handle subdir lists in global cache file.
...
Another FcCacheReadString return value check.
2006-01-30 15:59:17 +00:00
c5411c4cae
Make fccache more resilient to broken cache files by checking return value
...
of FcCacheReadString all the time.
reviewed by: plam
2006-01-30 15:44:13 +00:00
Keith Packard
Patrick Lam
Keith Packard