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

Make fc-cache avoid reading the whole world full of fonts

This commit is contained in:
Keith Packard 2002-07-01 05:11:20 +00:00
parent e6099fe979
commit ad07dcf486
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.4 2002/05/21 17:06:21 keithp Exp $ * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.5 2002/06/19 20:55:19 keithp Exp $
* *
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -93,7 +93,7 @@ nsubdirs (FcStrSet *set)
} }
static int static int
scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose) scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose)
{ {
int ret = 0; int ret = 0;
FcChar8 *dir; FcChar8 *dir;
@ -147,7 +147,7 @@ scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
fprintf (stderr, "\"%s\": not a directory, skipping\n", dir); fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
continue; continue;
} }
if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (0), dir, force)) if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, force))
{ {
fprintf (stderr, "\"%s\": error scanning\n", dir); fprintf (stderr, "\"%s\": error scanning\n", dir);
ret++; ret++;
@ -178,7 +178,7 @@ scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
ret++; ret++;
continue; continue;
} }
ret += scanDirs (sublist, program, force, verbose); ret += scanDirs (sublist, config, program, force, verbose);
FcStrSetDestroy (subdirs); FcStrSetDestroy (subdirs);
} }
FcStrListDone (list); FcStrListDone (list);
@ -253,7 +253,7 @@ main (int argc, char **argv)
} }
else else
list = FcConfigGetConfigDirs (config); list = FcConfigGetConfigDirs (config);
ret = scanDirs (list, argv[0], force, verbose); ret = scanDirs (list, config, argv[0], force, verbose);
if (verbose) if (verbose)
printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded"); printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded");
return ret; return ret;