Sort directory entries while scanning them from disk; prevents Heisenbugs

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 9ce22daf660884af223ed91df92bac740ea687c0..ad64ca83c21b896d07bc538348c6ae03d93147d4 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -1,7 +1,7 @@
 /*
  * $RCSId: xc/lib/fontconfig/src/fcdir.c,v 1.9 2002/08/31 22:17:32 keithp Exp $
  *
- * Copyright © 2000 Keith Packard
+ * Copyright © 2000 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -25,7 +25,7 @@
 #include "fcint.h"
 #include <dirent.h>
 
-static FcBool
+FcBool
 FcFileIsDir (const FcChar8 *file)
 {
     struct stat            statb;
@@ -150,6 +150,8 @@ FcFileScanConfig (FcFontSet *set,
                ret = FcFalse;
            }
        }
+       else if (font)
+           FcPatternDestroy (font);
        id++;
     } while (font && ret && id < count);
     return ret;
@@ -166,7 +168,15 @@ FcFileScan (FcFontSet          *set,
     return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
 }
 
-#define FC_MAX_FILE_LEN            4096
+/*
+ * 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
@@ -184,9 +194,12 @@ FcDirScanConfig (FcFontSet *set,
 {
     DIR                        *d;
     struct dirent      *e;
+    FcChar8            **dirlist;
+    int                        dirlistlen, dirlistalloc;
     FcChar8            *file;
     FcChar8            *base;
     FcBool             ret = FcTrue;
+    int                        i;
 
     if (config && !FcConfigAcceptFilename (config, dir))
        return FcTrue;
@@ -232,14 +245,40 @@ FcDirScanConfig (FcFontSet        *set,
            return FcTrue;
        return FcFalse;
     }
-    while (ret && (e = readdir (d)))
+    dirlistlen = 0;
+    dirlistalloc = 8;
+    dirlist = malloc(dirlistalloc * sizeof(FcChar8 *));
+    if (!dirlist)
+       return FcFalse;
+    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 (set, dirs, cache, blanks, file, force, config);
+           if (dirlistlen == dirlistalloc)
+           {
+               dirlistalloc *= 2;
+               dirlist = realloc(dirlist, dirlistalloc * sizeof(FcChar8 *));
+               if (!dirlist)
+                   return FcFalse;
+           }
+           dirlist[dirlistlen] = malloc(strlen (e->d_name) + 1);
+           if (!dirlist[dirlistlen])
+               return FcFalse;
+           strcpy(dirlist[dirlistlen], e->d_name);
+           dirlistlen++;
        }
     }
+    qsort(dirlist, dirlistlen, sizeof(FcChar8 *), cmpstringp);
+    i = 0;
+    while (ret && i < dirlistlen)
+    {
+       strcpy ((char *) base, (char *) dirlist[i]);
+       ret = FcFileScanConfig (set, dirs, cache, blanks, file, force, config);
+       i++;
+    }
+    for (i = 0; i < dirlistlen; i++)
+       free(dirlist[i]);
+    free (dirlist);
     free (file);
     closedir (d);
     /*