walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort directory entries while scanning them from disk; prevents Heisenbugs 

due to file ordering in a directory.
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-03-08 19:10:57 +00:00
parent d8951c0cc2
commit e3c6d3364c
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-03-08 Egmont Koblinger <egmont@uhulinux.hu>
reviewed by: plam
* src/fcdir.c (FcDirScanConfig):
Sort directory entries while scanning them from disk;
prevents Heisenbugs due to file ordering in a directory.
2006-03-07 Behdad Esfahbod <behdad@cs.toronto.edu> 2006-03-07 Behdad Esfahbod <behdad@cs.toronto.edu>
reviewed by: plam reviewed by: plam

44
src/fcdir.c
View File

@ -100,6 +100,16 @@ FcFileScan (FcFontSet *set,
return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0); 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 * Scan 'dir', adding font files to 'set' and
* subdirectories to 'dirs' * subdirectories to 'dirs'
@ -116,6 +126,8 @@ FcDirScanConfig (FcFontSet *set,
{ {
DIR *d; DIR *d;
struct dirent *e; struct dirent *e;
FcChar8 **dirlist;
int dirlistlen, dirlistalloc;
FcChar8 *file; FcChar8 *file;
const FcChar8 *d_can = 0; const FcChar8 *d_can = 0;
FcChar8 *base; FcChar8 *base;
@ -174,14 +186,40 @@ FcDirScanConfig (FcFontSet *set,
return FcFalse; 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) if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
{ {
strcpy ((char *) base, (char *) e->d_name); 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 (tmpSet, dirs, cache, blanks, file, force, config); ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config);
i++;
} }
} for (i = 0; i < dirlistlen; i++)
free(dirlist[i]);
free (dirlist);
free (file); free (file);
closedir (d); closedir (d);
/* /*