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

Make fc-cache more tolerant of missing font directories

This commit is contained in:
Keith Packard 2002-06-19 20:55:19 +00:00
parent 6f6563edb5
commit 0c35c0facb
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fc-cache/fc-cache.c
View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.2 2002/02/15 07:36:14 keithp Exp $ * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.4 2002/05/21 17:06:21 keithp Exp $
* *
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -25,6 +25,9 @@
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#else #else
@ -97,6 +100,7 @@ scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
FcFontSet *set; FcFontSet *set;
FcStrSet *subdirs; FcStrSet *subdirs;
FcStrList *sublist; FcStrList *sublist;
struct stat statb;
/* /*
* Now scan all of the directories into separate databases * Now scan all of the directories into separate databases
@ -123,9 +127,29 @@ scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
ret++; ret++;
continue; continue;
} }
if (stat ((char *) dir, &statb) == -1)
{
if (errno == ENOENT || errno == ENOTDIR)
{
fprintf (stderr, "\"%s\": no such directory, skipping\n", dir);
}
else
{
fprintf (stderr, "\"%s\": ", dir);
perror ("");
ret++;
}
continue;
}
if (!S_ISDIR (statb.st_mode))
{
fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
continue;
}
if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (0), dir, force)) if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (0), dir, force))
{ {
fprintf (stderr, "Can't scan \"%s\"\n", dir); fprintf (stderr, "\"%s\": error scanning\n", dir);
ret++; ret++;
continue; continue;
} }