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

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 771c09b2dd5926f94a55d6acc1c0bf790a9028f2..145226072571abe2d4a6880ee1727359edb26501 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -55,9 +55,6 @@ FcFileScanConfig (FcFontSet   *set,
     if (FcFileIsDir (file))
        return FcStrSetAdd (dirs, file);
 
-    if (force)
-       cache = 0;
-
     id = 0;
     do
     {
@@ -103,6 +100,16 @@ FcFileScan (FcFontSet          *set,
     return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
 }
 
+/*
+ * Strcmp helper that takes pointers to pointers, copied from qsort(3) manpage
+ */
+
+static int
+cmpstringp(const void *p1, const void *p2)
+{
+    return strcmp(* (char **) p1, * (char **) p2);
+}
+
 /*
  * Scan 'dir', adding font files to 'set' and
  * subdirectories to 'dirs'
@@ -119,8 +126,9 @@ FcDirScanConfig (FcFontSet  *set,
 {
     DIR                        *d;
     struct dirent      *e;
+    FcChar8            **dirlist;
+    int                        dirlistlen, dirlistalloc;
     FcChar8            *file;
-    const FcChar8      *d_can = 0;
     FcChar8            *base;
     FcBool             ret = FcTrue;
     FcFontSet          *tmpSet;
@@ -129,11 +137,6 @@ FcDirScanConfig (FcFontSet *set,
     if (config && !FcConfigAcceptFilename (config, dir))
        return FcTrue;
 
-    if (config)
-       d_can = FcConfigNormalizeFontDir (config, dir);
-    if (d_can)
-       dir = d_can;
-
     if (!force)
     {
        /*
@@ -142,7 +145,9 @@ FcDirScanConfig (FcFontSet  *set,
        if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
            return FcTrue;
 
-       if (FcDirCacheValid (dir) && FcDirCacheRead (set, dirs, dir, config))
+       if (FcDirCacheValid (dir, config) && 
+           FcDirCacheHasCurrentArch (dir, config) &&
+           FcDirCacheRead (set, dirs, dir, config))
            return FcTrue;
     }
     
@@ -169,22 +174,56 @@ FcDirScanConfig (FcFontSet        *set,
     }
 
     tmpSet = FcFontSetCreate();
-    if (!tmpSet)
-    {  
-       free (file);
-       return FcFalse;
+    if (!tmpSet) 
+    {
+       ret = FcFalse;
+       goto bail0;
     }
 
-    while (ret && (e = readdir (d)))
+    dirlistlen = 0;
+    dirlistalloc = 8;
+    dirlist = malloc(dirlistalloc * sizeof(FcChar8 *));
+    if (!dirlist) 
+    {
+       ret = FcFalse;
+       goto bail1;
+    }
+    while ((e = readdir (d)))
     {
        if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
        {
-           strcpy ((char *) base, (char *) e->d_name);
-           ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config);
+           if (dirlistlen == dirlistalloc)
+           {
+                FcChar8        **tmp_dirlist;
+
+               dirlistalloc *= 2;
+               tmp_dirlist = realloc(dirlist, 
+                                      dirlistalloc * sizeof(FcChar8 *));
+               if (!tmp_dirlist) 
+                {
+                   ret = FcFalse;
+                   goto bail2;
+               }
+                dirlist = tmp_dirlist;
+           }
+           dirlist[dirlistlen] = malloc(strlen (e->d_name) + 1);
+           if (!dirlist[dirlistlen]) 
+            {
+               ret = FcFalse;
+               goto bail2;
+           }
+           strcpy((char *)dirlist[dirlistlen], e->d_name);
+           dirlistlen++;
        }
     }
-    free (file);
-    closedir (d);
+    qsort(dirlist, dirlistlen, sizeof(FcChar8 *), cmpstringp);
+    i = 0;
+    while (ret && i < dirlistlen)
+    {
+       strcpy ((char *) base, (char *) dirlist[i]);
+       ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config);
+       i++;
+    }
     /*
      * Now that the directory has been scanned,
      * add the cache entry 
@@ -201,8 +240,20 @@ FcDirScanConfig (FcFontSet *set,
        free (tmpSet->fonts);
     }
     FcMemFree (FC_MEM_FONTSET, sizeof (FcFontSet));
+
+ bail2:
+    for (i = 0; i < dirlistlen; i++)
+       free(dirlist[i]);
+
+    free (dirlist);
+
+ bail1:
     free (tmpSet);
-       
+    
+ bail0:
+    closedir (d);
+    
+    free (file);
     return ret;
 }
 
@@ -220,5 +271,5 @@ FcDirScan (FcFontSet            *set,
 FcBool
 FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
 {
-    return FcDirCacheWrite (set, dirs, dir);
+    return FcDirCacheWrite (set, dirs, dir, FcConfigGetCurrent ());
 }