/*
* $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
#include "fcint.h"
#include <dirent.h>
-static FcBool
+FcBool
FcFileIsDir (const FcChar8 *file)
{
struct stat statb;
/*
* Add the font
*/
- if (font)
+ if (font && (!config || FcConfigAcceptFont (config, font)))
{
if (!FcFontSetAdd (set, font))
{
ret = FcFalse;
}
}
+ else if (font)
+ FcPatternDestroy (font);
id++;
} while (font && ret && id < count);
return ret;
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
{
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;
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);
/*