Commit 275cf6cd authored by Patrick Lam's avatar Patrick Lam
Browse files

Don't stop scanning if a directory in fonts.conf doesn't exist, because

    subsequent directories might exist.
reviewed by: plam
parent 81d97094
2006-01-30 Mike Fabian <mfabian@suse.de>
reviewed by: plam
* fc-cache/fc-cache.c (scanDirs):
Don't stop scanning if a directory in fonts.conf doesn't
exist, because subsequent directories might exist.
2006-01-30 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheLoad):
......
......@@ -113,6 +113,7 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
{
int ret = 0;
const FcChar8 *dir;
const FcChar8 *dir_orig;
FcFontSet *set;
FcStrSet *subdirs;
FcStrList *sublist;
......@@ -122,17 +123,24 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
* Now scan all of the directories into separate databases
* and write out the results
*/
while ((dir = FcStrListNext (list)))
while ((dir_orig = FcStrListNext (list)))
{
dir = FcConfigNormalizeFontDir (config, dir);
if (!dir)
return FcFalse;
dir = FcConfigNormalizeFontDir (config, dir_orig);
if (verbose)
{
printf ("%s: \"%s\": ", program, dir);
printf ("%s: \"%s\": ", program, dir ? dir : dir_orig);
fflush (stdout);
}
if (!dir)
{
if (verbose)
printf ("skipping, no such directory\n");
continue;
}
set = FcFontSetCreate ();
if (!set)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment