Eliminate NormalizeDir. Eliminate gratuitous stat/access calls per dir.

[fontconfig.git] / src / fccfg.c

diff --git a/src/fccfg.c b/src/fccfg.c
index 6e5174b505df51090ea4d8c5deae6b12eff6f3f9..3c3681a100620e9c803e811aae0f55195121e340 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -22,9 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <dirent.h>
 #include <sys/types.h>
-#include "fcint.h"
 
 #if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
 #define STRICT
@@ -100,13 +100,17 @@ FcConfigCreate (void)
            if (!FcConfigSetCache (config, cache_dir))
            {
                FcStrFree (cache_dir);
-               goto bail6;
+               goto bail8;
            }
            FcStrFree (cache_dir);
        }
     }
 #endif
 
+    config->cacheDirs = FcStrSetCreate ();
+    if (!config->cacheDirs)
+       goto bail9;
+    
     config->blanks = 0;
 
     config->substPattern = 0;
@@ -120,6 +124,8 @@ FcConfigCreate (void)
     
     return config;
 
+bail9:
+    FcStrFree (config->cache);
 bail8:
     FcFontSetDestroy (config->rejectPatterns);
 bail7:
@@ -226,6 +232,7 @@ FcConfigDestroy (FcConfig *config)
 
     FcStrSetDestroy (config->configDirs);
     FcStrSetDestroy (config->fontDirs);
+    FcStrSetDestroy (config->cacheDirs);
     FcStrSetDestroy (config->configFiles);
     FcStrSetDestroy (config->acceptGlobs);
     FcStrSetDestroy (config->rejectGlobs);
@@ -283,7 +290,7 @@ FcConfigBuildFonts (FcConfig *config)
     {
        list = FcConfigGetFontDirs (config);
        if (!list)
-           goto bail2;
+           goto bail3;
        
        while ((dir = FcStrListNext (list)))
        {
@@ -334,8 +341,10 @@ FcConfigBuildFonts (FcConfig *config)
     FcConfigSetFonts (config, fonts, FcSetSystem);
     
     return FcTrue;
-bail2:
+bail3:
     FcStrSetDestroy (oldDirs);
+bail2:
+    FcGlobalCacheDestroy (cache);
 bail1:
     FcFontSetDestroy (fonts);
 bail0:
@@ -390,90 +399,35 @@ FcConfigAddFontDir (FcConfig          *config,
     return FcStrSetAddFilename (config->fontDirs, d);
 }
 
-static FcBool
-FcConfigAddFontDirSubdirs (FcConfig        *config,
-                          const FcChar8   *d)
+FcBool
+FcConfigAddDir (FcConfig           *config,
+               const FcChar8       *d)
 {
-    DIR *dir;
-    struct dirent *e;
-    FcChar8 *subdir;
-    
-    if (!(dir = opendir ((char *) d)))
-       return FcFalse;
-    if (!(subdir = (FcChar8 *) malloc (strlen ((char *) d) + FC_MAX_FILE_LEN + 2)))
-    {
-       fprintf (stderr, "out of memory");
-       return FcFalse;
-    }
-    while ((e = readdir (dir)))
-    {
-       if (strcmp (e->d_name, ".") && strcmp (e->d_name, "..") &&
-           strlen (e->d_name) < FC_MAX_FILE_LEN)
-       {
-           strcpy ((char *)subdir, (char *)d);
-           strcat ((char *)subdir, "/");
-           strcat ((char *)subdir, e->d_name);
-           if (FcFileIsDir (subdir))
-           {
-               FcConfigAddFontDir (config, subdir);
-               FcConfigAddFontDirSubdirs (config, subdir);
-           }
-       }
-    }
-    free (subdir);
-    closedir (dir);
-    return FcTrue;
+    return (FcConfigAddConfigDir (config, d) && 
+           FcConfigAddFontDir (config, d));
 }
 
-const FcChar8 *
-FcConfigNormalizeFontDir (FcConfig     *config, 
-                         const FcChar8 *d)
+FcStrList *
+FcConfigGetFontDirs (FcConfig  *config)
 {
-    /* If this is a bottleneck, we can cache the fontDir inodes. */
-    ino_t      di;
-    dev_t      dd;
-    int                n;
-    struct stat s;
-
-    if (stat ((char *)d, &s) == -1)
-       return 0;
-    di = s.st_ino; dd = s.st_dev;
-
-    for (n = 0; n < config->fontDirs->num; n++)
-    {
-       if (stat ((char *)config->fontDirs->strs[n], &s) == -1)
-           continue;
-       if (di == s.st_ino && dd == s.st_dev)
-           return config->fontDirs->strs[n];
-    }
-
-    /* Ok, we didn't find it in fontDirs; let's add subdirs.... */
-    for (n = 0; n < config->fontDirs->num; n++)
-       FcConfigAddFontDirSubdirs (config, config->fontDirs->strs[n]);
-
-    /* ... and try again. */
-    for (n = 0; n < config->fontDirs->num; n++)
+    if (!config)
     {
-       if (stat ((char *)config->fontDirs->strs[n], &s) == -1)
-           continue;
-       if (di == s.st_ino && dd == s.st_dev)
-           return config->fontDirs->strs[n];
+       config = FcConfigGetCurrent ();
+       if (!config)
+           return 0;
     }
-
-    /* if it fails, then really give up. */
-    return 0;
+    return FcStrListCreate (config->fontDirs);
 }
 
 FcBool
-FcConfigAddDir (FcConfig           *config,
-               const FcChar8       *d)
+FcConfigAddCacheDir (FcConfig      *config,
+                    const FcChar8  *d)
 {
-    return (FcConfigAddConfigDir (config, d) && 
-           FcConfigAddFontDir (config, d));
+    return FcStrSetAddFilename (config->cacheDirs, d);
 }
 
 FcStrList *
-FcConfigGetFontDirs (FcConfig  *config)
+FcConfigGetCacheDirs (FcConfig *config)
 {
     if (!config)
     {
@@ -481,9 +435,9 @@ FcConfigGetFontDirs (FcConfig       *config)
        if (!config)
            return 0;
     }
-    return FcStrListCreate (config->fontDirs);
+    return FcStrListCreate (config->cacheDirs);
 }
-
+    
 FcBool
 FcConfigAddConfigFile (FcConfig            *config,
                       const FcChar8   *f)
@@ -578,17 +532,21 @@ FcBool
 FcConfigAddBlank (FcConfig     *config,
                  FcChar32      blank)
 {
-    FcBlanks   *b;
+    FcBlanks   *b, *freeme = 0;
     
     b = config->blanks;
     if (!b)
     {
-       b = FcBlanksCreate ();
+       freeme = b = FcBlanksCreate ();
        if (!b)
            return FcFalse;
     }
     if (!FcBlanksAdd (b, blank))
+    {
+        if (freeme)
+            FcBlanksDestroy (freeme);
        return FcFalse;
+    }
     config->blanks = b;
     return FcTrue;
 }
@@ -866,6 +824,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
     FcValue    v, vl, vr;
     FcResult   r;
     FcMatrix   *m;
+    FcChar8     *str;
     
     switch (e->op) {
     case FcOpInteger:
@@ -996,7 +955,9 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
                switch (e->op) {
                case FcOpPlus:
                    v.type = FcTypeString;
-                   v.u.s = FcStrStaticName (FcStrPlus (vl.u.s, vr.u.s));
+                   str = FcStrPlus (vl.u.s, vr.u.s);
+                   v.u.s = FcStrStaticName (str);
+                   FcStrFree (str);
                         
                    if (!v.u.s)
                        v.type = FcTypeVoid;
@@ -1477,7 +1438,8 @@ FcConfigSubstituteWithPat (FcConfig    *config,
                    /*
                     * Delete the marked value
                     */
-                   FcConfigDel (&st[i].elt->values, thisValue);
+                    if (thisValue)
+                       FcConfigDel (&st[i].elt->values, thisValue);
                    /*
                     * Adjust any pointers into the value list to ensure
                     * future edits occur at the same place
@@ -1532,6 +1494,7 @@ FcConfigSubstituteWithPat (FcConfig    *config,
                FcConfigPatternAdd (p, e->field, l, FcTrue);
                break;
            default:
+                FcValueListDestroy (FcValueListPtrCreateDynamic(l));
                break;
            }
        }
@@ -1849,6 +1812,7 @@ FcConfigAppFontAddFile (FcConfig    *config,
        }
        FcStrListDone (sublist);
     }
+    FcStrSetDestroy (subdirs);
     return FcTrue;
 }
 
@@ -1896,6 +1860,7 @@ FcConfigAppFontAddDir (FcConfig       *config,
        }
        FcStrListDone (sublist);
     }
+    FcStrSetDestroy (subdirs);
     return FcTrue;
 }