if (FcFileIsDir (file))
return FcStrSetAdd (dirs, file);
- if (force)
- cache = 0;
-
id = 0;
do
{
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'
{
DIR *d;
struct dirent *e;
+ FcChar8 **dirlist;
+ int dirlistlen, dirlistalloc;
FcChar8 *file;
- const FcChar8 *d_can = 0;
FcChar8 *base;
FcBool ret = FcTrue;
FcFontSet *tmpSet;
if (config && !FcConfigAcceptFilename (config, dir))
return FcTrue;
- if (config)
- d_can = FcConfigNormalizeFontDir (config, dir);
- if (d_can)
- dir = d_can;
-
if (!force)
{
/*
if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
return FcTrue;
- if (FcDirCacheValid (dir) &&
- FcDirCacheHasCurrentArch (dir) &&
+ if (FcDirCacheValid (dir, config) &&
+ FcDirCacheHasCurrentArch (dir, config) &&
FcDirCacheRead (set, dirs, dir, config))
return FcTrue;
}
}
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
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;
}
FcBool
FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
{
- return FcDirCacheWrite (set, dirs, dir);
+ return FcDirCacheWrite (set, dirs, dir, FcConfigGetCurrent ());
}