X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=src%2Ffcdir.c;h=8a2b97625066eeb05eeffc014cebb8a749056441;hp=a55c5fd3a47f5d301f58887c6d141b26d663683a;hb=HEAD;hpb=c2c6976d1a88cc35143ffcc34f3c38d0a28d34f4 diff --git a/src/fcdir.c b/src/fcdir.c index a55c5fd..8a2b976 100644 --- a/src/fcdir.c +++ b/src/fcdir.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcdir.c,v 1.9 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcdir.c * * Copyright © 2000 Keith Packard * @@ -7,15 +7,15 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in + * documentation, and that the name of the author(s) not be used in * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no + * specific, written prior permission. The authors make no * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -30,7 +30,7 @@ FcFileIsDir (const FcChar8 *file) { struct stat statb; - if (stat ((const char *) file, &statb) != 0) + if (FcStat (file, &statb) != 0) return FcFalse; return S_ISDIR(statb.st_mode); } @@ -45,7 +45,7 @@ FcFileScanFontConfig (FcFontSet *set, FcBool ret = FcTrue; int id; int count = 0; - + id = 0; do { @@ -65,7 +65,7 @@ FcFileScanFontConfig (FcFontSet *set, /* * Edit pattern with user-defined rules */ - if (config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan)) + if (font && config && !FcConfigSubstitute (config, font, FcMatchScan)) { FcPatternDestroy (font); font = NULL; @@ -75,7 +75,7 @@ FcFileScanFontConfig (FcFontSet *set, /* * Add the font */ - if (font && (!config || FcConfigAcceptFont (config, font))) + if (font) { if (FcDebug() & FC_DBG_SCANV) { @@ -117,7 +117,7 @@ FcFileScan (FcFontSet *set, const FcChar8 *file, FcBool force) { - return FcFileScanConfig (set, dirs, blanks, file, NULL); + return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ()); } /* @@ -129,26 +129,30 @@ cmpstringp(const void *p1, const void *p2) return strcmp(* (char **) p1, * (char **) p2); } -/* - * Scan the specified directory and construct a cache of its contents - */ -FcCache * -FcDirCacheScan (const FcChar8 *dir, FcConfig *config) +FcBool +FcDirScanConfig (FcFontSet *set, + FcStrSet *dirs, + FcBlanks *blanks, + const FcChar8 *dir, + FcBool force, /* XXX unused */ + FcConfig *config) { DIR *d; struct dirent *e; FcStrSet *files; - FcStrSet *dirs; FcChar8 *file; FcChar8 *base; FcBool ret = FcTrue; - FcFontSet *set; int i; - FcBlanks *blanks = FcConfigGetBlanks (config); - FcCache *cache = NULL; - if (FcDebug () & FC_DBG_FONTSET) - printf ("cache scan dir %s\n", dir); + if (!force) + return FcFalse; + + if (!set && !dirs) + return FcTrue; + + if (!blanks) + blanks = FcConfigGetBlanks (config); /* freed below */ file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1); @@ -160,7 +164,7 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config) strcpy ((char *) file, (char *) dir); strcat ((char *) file, "/"); base = file + strlen ((char *) file); - + if (FcDebug () & FC_DBG_SCAN) printf ("\tScanning dir %s\n", dir); @@ -168,18 +172,9 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config) if (!d) { /* Don't complain about missing directories */ - if (errno == ENOENT) - ret = FcTrue; - else + if (errno != ENOENT) ret = FcFalse; - goto bail_1; - } - - set = FcFontSetCreate(); - if (!set) - { - ret = FcFalse; - goto bail0; + goto bail; } files = FcStrSetCreate (); @@ -204,41 +199,99 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config) * Sort files to make things prettier */ qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp); - - dirs = FcStrSetCreate (); - if (!dirs) - goto bail2; - + /* * Scan file files to build font patterns */ for (i = 0; i < files->num; i++) FcFileScanConfig (set, dirs, blanks, files->strs[i], config); - + +bail2: + FcStrSetDestroy (files); +bail1: + closedir (d); +bail: + return ret; +} + +FcBool +FcDirScan (FcFontSet *set, + FcStrSet *dirs, + FcFileCache *cache, /* XXX unused */ + FcBlanks *blanks, + const FcChar8 *dir, + FcBool force /* XXX unused */) +{ + if (cache || !force) + return FcFalse; + + return FcDirScanConfig (set, dirs, blanks, dir, force, FcConfigGetCurrent ()); +} + +/* + * Scan the specified directory and construct a cache of its contents + */ +FcCache * +FcDirCacheScan (const FcChar8 *dir, FcConfig *config) +{ + FcStrSet *dirs; + FcBool ret = FcTrue; + FcFontSet *set; + FcCache *cache = NULL; + struct stat dir_stat; + + if (FcDebug () & FC_DBG_FONTSET) + printf ("cache scan dir %s\n", dir); + + if (FcStat (dir, &dir_stat) < 0) + { + if (errno != ENOENT) + ret = FcFalse; + goto bail; + } + + set = FcFontSetCreate(); + if (!set) + { + ret = FcFalse; + goto bail; + } + + dirs = FcStrSetCreate (); + if (!dirs) + { + ret = FcFalse; + goto bail1; + } + + /* + * Scan the dir + */ + if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config)) + { + ret = FcFalse; + goto bail2; + } + /* * Build the cache object */ - cache = FcDirCacheBuild (set, dir, dirs); + cache = FcDirCacheBuild (set, dir, &dir_stat, dirs); if (!cache) - goto bail3; - + { + ret = FcFalse; + goto bail2; + } + /* * Write out the cache file, ignoring any troubles */ FcDirCacheWrite (cache, config); - - bail3: - FcStrSetDestroy (dirs); + bail2: - FcStrSetDestroy (files); + FcStrSetDestroy (dirs); bail1: FcFontSetDestroy (set); - - bail0: - closedir (d); - - bail_1: - free (file); bail: return cache; } @@ -251,40 +304,15 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) { FcCache *cache = NULL; - if (config && !FcConfigAcceptFilename (config, dir)) - return NULL; - /* Try to use existing cache file */ if (!force) cache = FcDirCacheLoad (dir, config, NULL); - + /* Not using existing cache file, construct new cache */ if (!cache) cache = FcDirCacheScan (dir, config); - - return cache; -} -FcBool -FcDirScanConfig (FcFontSet *set, - FcStrSet *dirs, - FcBlanks *blanks, - const FcChar8 *dir, - FcBool force, - FcConfig *config) -{ - return FcFalse; /* XXX fixme */ -} - -FcBool -FcDirScan (FcFontSet *set, - FcStrSet *dirs, - FcFileCache *cache, /* XXX unused */ - FcBlanks *blanks, - const FcChar8 *dir, - FcBool force) -{ - return FcDirScanConfig (set, dirs, blanks, dir, force, NULL); + return cache; } FcBool @@ -292,3 +320,6 @@ FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir) { return FcFalse; /* XXX deprecated */ } +#define __fcdir__ +#include "fcaliastail.h" +#undef __fcdir__