Compare device numbers as well as inodes. Always normalize directory names

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 4b01d91f6df74b7615d0ee46e9b03ec7b1f3f603..48f209e58a25835d891de2037e5f6ba826b1d2c1 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -48,6 +48,7 @@
 
 #define FC_FONT_FILE_INVALID   ((FcChar8 *) ".")
 #define FC_FONT_FILE_DIR       ((FcChar8 *) ".dir")
+#define FC_GLOBAL_MAGIC_COOKIE "GLOBAL"
 
 #ifdef _WIN32
 #define FC_SEARCH_PATH_SEPARATOR ';'
@@ -447,11 +448,13 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
 FcBool
 FcGlobalCacheUpdate (FcGlobalCache  *cache,
                     const char     *file,
-                    FcFontSet      *set);
+                    FcFontSet      *set,
+                    FcConfig       *config);
 
 FcBool
 FcGlobalCacheSave (FcGlobalCache    *cache,
-                  const FcChar8    *cache_file);
+                  const FcChar8    *cache_file,
+                  FcConfig         *config);
 
 FcFontSet *
 FcCacheRead (FcConfig *config, FcGlobalCache * cache);
@@ -460,10 +463,17 @@ FcBool
 FcDirCacheWrite (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir);
 
 FcBool
-FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir);
+FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config);
 
+extern int *_fcBankId, *_fcBankIdx;
 int
-FcCacheBankToIndex (int bank);
+FcCacheBankToIndexMTF (int bank);
+
+static __inline__ int
+FcCacheBankToIndex (int bank)
+{
+    return (_fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
+}
 
 const char *
 FcCacheFindBankDir (int bank);
@@ -486,6 +496,10 @@ FcBool
 FcConfigAddConfigFile (FcConfig                *config,
                       const FcChar8    *f);
 
+const FcChar8 *
+FcConfigNormalizeFontDir (FcConfig     *config, 
+                         const FcChar8 *d);
+
 FcBool
 FcConfigSetCache (FcConfig     *config,
                  const FcChar8 *c);
@@ -871,8 +885,8 @@ FcPatternDistributeBytes (FcCache * metadata, void * block_ptr);
 
 /* please don't access these outside of fcpat.c! only visible so that
  * *PtrU can be inlined. */
-extern FcValueList ** fcvaluelists;
-extern FcPatternElt ** fcpatternelts;
+extern FcValueList ** _fcValueLists;
+extern FcPatternElt ** _fcPatternElts;
 
 static __inline__ FcValueList * 
 FcValueListPtrU (FcValueListPtr pi)
@@ -880,7 +894,7 @@ FcValueListPtrU (FcValueListPtr pi)
     if (pi.bank == FC_BANK_DYNAMIC)
         return pi.u.dyn;
 
-    return &fcvaluelists[FcCacheBankToIndex(pi.bank)][pi.u.stat];
+    return &_fcValueLists[FcCacheBankToIndex(pi.bank)][pi.u.stat];
 }
 
 static __inline__ FcPatternElt *
@@ -889,7 +903,7 @@ FcPatternEltU (FcPatternEltPtr pei)
     if (pei.bank == FC_BANK_DYNAMIC)
        return pei.u.dyn;
 
-    return &fcpatternelts[FcCacheBankToIndex(pei.bank)][pei.u.stat];
+    return &_fcPatternElts[FcCacheBankToIndex(pei.bank)][pei.u.stat];
 }
 
 FcPatternElt *