X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-cache%2Ffc-cache.c;h=bda8b1468cfa7a0504cac35a821a186070ed0b2a;hb=b190ad9da46ff2e8a9ede0afcb59a6c59641515b;hp=5fc409200b88c46cf1c185600bd0138bd6e566b3;hpb=f57783d2e9c7362b1e5d5e3a967ba90fa49ade6e;p=fontconfig.git diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index 5fc4092..bda8b14 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -31,7 +31,7 @@ #define HAVE_GETOPT 1 #endif -#include "fcint.h" +#include #include #include #include @@ -113,30 +113,16 @@ usage (char *program) static FcStrSet *processed_dirs; static int -nsubdirs (FcStrSet *set) +scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose) { - FcStrList *list; - int n = 0; - - list = FcStrListCreate (set); - if (!list) - return 0; - while (FcStrListNext (list)) - n++; - FcStrListDone (list); - return n; -} - -static int -scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool really_force, FcBool verbose) -{ - int ret = 0; - const FcChar8 *dir; - FcFontSet *set; - FcStrSet *subdirs; - FcStrList *sublist; - struct stat statb; - FcBool was_valid; + int ret = 0; + const FcChar8 *dir; + FcStrSet *subdirs; + FcStrList *sublist; + FcCache *cache; + struct stat statb; + FcBool was_valid; + int i; /* * Now scan all of the directories into separate databases @@ -146,7 +132,7 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool { if (verbose) { - printf ("%s: \"%s\": ", program, dir); + printf ("%s: ", dir); fflush (stdout); } @@ -164,22 +150,6 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool continue; } - set = FcFontSetCreate (); - if (!set) - { - fprintf (stderr, "%s: Can't create font set\n", dir); - ret++; - continue; - } - subdirs = FcStrSetCreate (); - if (!subdirs) - { - fprintf (stderr, "%s: Can't create directory set\n", dir); - ret++; - FcFontSetDestroy (set); - continue; - } - if (access ((char *) dir, W_OK) < 0) { switch (errno) { @@ -187,8 +157,6 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool case ENOTDIR: if (verbose) printf ("skipping, no such directory\n"); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); continue; case EACCES: case EROFS: @@ -201,8 +169,6 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool perror (""); ret++; - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); continue; } } @@ -210,44 +176,48 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool { fprintf (stderr, "\"%s\": ", dir); perror (""); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); ret++; continue; } if (!S_ISDIR (statb.st_mode)) { fprintf (stderr, "\"%s\": not a directory, skipping\n", dir); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); continue; } if (really_force) FcDirCacheUnlink (dir, config); - if (!force) - was_valid = FcDirCacheValid (dir); + cache = NULL; + was_valid = FcFalse; + if (!force) { + cache = FcDirCacheLoad (dir, config, NULL); + if (cache) + was_valid = FcTrue; + } - if (!FcDirScanConfig (set, subdirs, FcConfigGetBlanks (config), dir, force, config)) + if (!cache) { - fprintf (stderr, "%s: error scanning\n", dir); - FcFontSetDestroy (set); - FcStrSetDestroy (subdirs); - ret++; - continue; + cache = FcDirCacheRead (dir, FcTrue, config); + if (!cache) + { + fprintf (stderr, "%s: error scanning\n", dir); + ret++; + continue; + } } - if (!force && was_valid) + + if (was_valid) { if (verbose) printf ("skipping, %d fonts, %d dirs\n", - set->nfont, nsubdirs(subdirs)); + FcCacheNumFont (cache), FcCacheNumSubdir (cache)); } else { if (verbose) printf ("caching, %d fonts, %d dirs\n", - set->nfont, nsubdirs (subdirs)); + FcCacheNumFont (cache), FcCacheNumSubdir (cache)); if (!FcDirCacheValid (dir)) { @@ -256,7 +226,20 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool ret++; } } - FcFontSetDestroy (set); + + subdirs = FcStrSetCreate (); + if (!subdirs) + { + fprintf (stderr, "%s: Can't create subdir set\n", dir); + ret++; + FcDirCacheUnload (cache); + continue; + } + for (i = 0; i < FcCacheNumSubdir (cache); i++) + FcStrSetAdd (subdirs, FcCacheSubdir (cache, i)); + + FcDirCacheUnload (cache); + sublist = FcStrListCreate (subdirs); FcStrSetDestroy (subdirs); if (!sublist) @@ -266,73 +249,61 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool continue; } FcStrSetAdd (processed_dirs, dir); - ret += scanDirs (sublist, config, program, force, really_force, verbose); + ret += scanDirs (sublist, config, force, really_force, verbose); } FcStrListDone (list); return ret; } -FcCache * -FcCacheFileMap (const FcChar8 *file, struct stat *file_stat) -{ - FcCache *cache; - int fd; - - fd = open (file, O_RDONLY | O_BINARY); - if (fd < 0) - return NULL; - if (fstat (fd, file_stat) < 0) { - close (fd); - return NULL; - } - if (FcDirCacheLoad (fd, file_stat->st_size, &cache)) { - close (fd); - return cache; - } - close (fd); - return NULL; -} - static FcBool cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose) { DIR *d; struct dirent *ent; - char *dir_base; + FcChar8 *dir_base; FcBool ret = FcTrue; FcBool remove; FcCache *cache; struct stat file_stat; struct stat target_stat; - dir_base = FcStrPlus (dir, "/"); + dir_base = FcStrPlus (dir, (FcChar8 *) "/"); + if (!dir_base) + { + fprintf (stderr, "%s: out of memory\n", dir); + return FcFalse; + } if (access ((char *) dir, W_OK|X_OK) != 0) { if (verbose) - printf ("%s: skipping unwritable cache directory\n", dir); + printf ("%s: not cleaning unwritable cache directory\n", dir); + FcStrFree (dir_base); return FcTrue; } - d = opendir (dir); + if (verbose) + printf ("%s: cleaning cache directory\n", dir); + d = opendir ((char *) dir); if (!d) { - perror (dir); + perror ((char *) dir); + FcStrFree (dir_base); return FcFalse; } while ((ent = readdir (d))) { FcChar8 *file_name; - FcChar8 *target_dir; + const FcChar8 *target_dir; if (ent->d_name[0] == '.') continue; - file_name = FcStrPlus (dir_base, ent->d_name); + file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name); if (!file_name) { fprintf (stderr, "%s: allocation failure\n", dir); ret = FcFalse; break; } - cache = FcCacheFileMap (file_name, &file_stat); + cache = FcDirCacheLoadFile (file_name, &file_stat); if (!cache) { fprintf (stderr, "%s: invalid cache file: %s\n", dir, ent->d_name); @@ -342,7 +313,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose) } target_dir = FcCacheDir (cache); remove = FcFalse; - if (stat (target_dir, &target_stat) < 0) + if (stat ((char *) target_dir, &target_stat) < 0) { if (verbose) printf ("%s: %s: missing directory: %s \n", @@ -358,16 +329,18 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose) } if (remove) { - if (unlink (file_name) < 0) + if (unlink ((char *) file_name) < 0) { - perror (file_name); + perror ((char *) file_name); ret = FcFalse; } } + FcDirCacheUnload (cache); FcStrFree (file_name); } closedir (d); + FcStrFree (dir_base); return ret; } @@ -460,7 +433,7 @@ main (int argc, char **argv) } while (argv[i]) { - if (!FcStrSetAdd (dirs, (FcChar8 *) argv[i])) + if (!FcStrSetAddFilename (dirs, (FcChar8 *) argv[i])) { fprintf (stderr, "%s: Can't add directory\n", argv[0]); return 1; @@ -478,7 +451,7 @@ main (int argc, char **argv) return 1; } - ret = scanDirs (list, config, argv[0], force, really_force, verbose); + ret = scanDirs (list, config, force, really_force, verbose); FcStrSetDestroy (processed_dirs);