fc-cache: convert

[fontconfig.git] / fc-cache / fc-cache.c

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index d2653507eff17f2b7e7348ca7f4bf6e29e1f789f..9bac25d7f3e6db825d85ef7a7be111df3a6cfb72 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -67,8 +67,10 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 const struct option longopts[] = {
+    {"convert", 0, 0, 'c'},
     {"force", 0, 0, 'f'},
     {"really-force", 0, 0, 'r'},
+    {"root", 1, 0, 'R'},
     {"system-only", 0, 0, 's'},
     {"version", 0, 0, 'V'},
     {"verbose", 0, 0, 'v'},
@@ -87,10 +89,10 @@ usage (char *program, int error)
 {
     FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-    fprintf (file, "usage: %s [-frsvVh] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+    fprintf (file, "usage: %s [-frRsvVh] [--force|--really-force] [--root <root>] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
             program);
 #else
-    fprintf (file, "usage: %s [-frsvVh] [dirs]\n",
+    fprintf (file, "usage: %s [-frRsvVh] [dirs]\n",
             program);
 #endif
     fprintf (file, "Build font information caches in [dirs]\n"
@@ -99,6 +101,7 @@ usage (char *program, int error)
 #if HAVE_GETOPT_LONG
     fprintf (file, "  -f, --force          scan directories with apparently valid caches\n");
     fprintf (file, "  -r, --really-force   erase all existing caches, then rescan\n");
+    fprintf (file, "  -R, --root <root>    change to <root> before loading files\n");
     fprintf (file, "  -s, --system-only    scan system-wide directories only\n");
     fprintf (file, "  -v, --verbose        display status information while busy\n");
     fprintf (file, "  -V, --version        display font config version and exit\n");
@@ -106,6 +109,7 @@ usage (char *program, int error)
 #else
     fprintf (file, "  -f         (force)   scan directories with apparently valid caches\n");
     fprintf (file, "  -r,   (really force) erase all existing caches, then rescan\n");
+    fprintf (file, "  -R <root>  (root)    change to <root> before loading files\n");
     fprintf (file, "  -s         (system)  scan system-wide directories only\n");
     fprintf (file, "  -v         (verbose) display status information while busy\n");
     fprintf (file, "  -V         (version) display font config version and exit\n");
@@ -154,7 +158,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
            continue;
        }
 
-       if (stat ((char *) dir, &statb) == -1)
+       if (FcStat (config, dir, &statb) == -1)
        {
            switch (errno) {
            case ENOENT:
@@ -253,34 +257,34 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
 {
     DIR                *d;
     struct dirent *ent;
-    FcChar8    *dir_base;
+    FcChar8    *fullDir;
+    FcChar8    *checkDir;
     FcBool     ret = FcTrue;
     FcBool     remove;
     FcCache    *cache;
     struct stat        target_stat;
 
-    dir_base = FcStrPlus (dir, (FcChar8 *) "/");
-    if (!dir_base)
-    {
-       fprintf (stderr, "%s: out of memory\n", dir);
-       return FcFalse;
-    }
-    if (access ((char *) dir, W_OK) != 0)
+    fullDir = FcConfigGetRootPlus (config, dir);
+    if (fullDir)
+       checkDir = fullDir;
+    else
+       checkDir = dir;
+
+    if (access ((char *) checkDir, W_OK) != 0)
     {
        if (verbose)
            printf ("%s: not cleaning %s cache directory\n", dir,
                    access ((char *) dir, F_OK) == 0 ? "unwritable" : "non-existent");
-       FcStrFree (dir_base);
-       return FcTrue;
+       goto done;
     }
     if (verbose)
        printf ("%s: cleaning cache directory\n", dir);
-    d = opendir ((char *) dir);
+    d = opendir ((char *) checkDir);
     if (!d)
     {
        perror ((char *) dir);
-       FcStrFree (dir_base);
-       return FcFalse;
+       ret = FcFalse;
+       goto done;
     }
     while ((ent = readdir (d)))
     {
@@ -295,7 +299,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
            strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX))
            continue;
        
-       file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
+       file_name = FcStrPathPlus (dir, (const FcChar8 *) ent->d_name, NULL);
        if (!file_name)
        {
            fprintf (stderr, "%s: allocation failure\n", dir);
@@ -303,7 +307,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
            break;
        }
        remove = FcFalse;
-       cache = FcDirCacheLoadFile (file_name, NULL);
+       cache = FcDirCacheLoadFile2 (file_name, config, NULL);
        if (!cache)
        {
            if (verbose)
@@ -313,7 +317,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
        else
        {
            target_dir = FcCacheDir (cache);
-           if (stat ((char *) target_dir, &target_stat) < 0)
+           if (FcStat (config, target_dir, &target_stat) < 0)
            {
                if (verbose)
                    printf ("%s: %s: missing directory: %s \n",
@@ -323,18 +327,25 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
        }
        if (remove)
        {
-           if (unlink ((char *) file_name) < 0)
+           FcChar8 *unlink_file = FcConfigGetRootPlus (config, file_name);
+           if (!unlink_file)
+               unlink_file = file_name;
+           if (unlink ((char *) unlink_file) < 0)
            {
-               perror ((char *) file_name);
+               perror ((char *) unlink_file);
                ret = FcFalse;
            }
+           if (unlink_file != file_name)
+               FcStrFree (unlink_file);
        }
        FcDirCacheUnload (cache);
         FcStrFree (file_name);
     }
     
     closedir (d);
-    FcStrFree (dir_base);
+ done:
+    if (fullDir)
+       FcStrFree (fullDir);
     return ret;
 }
 
@@ -369,25 +380,34 @@ main (int argc, char **argv)
     FcBool     really_force = FcFalse;
     FcBool     systemOnly = FcFalse;
     FcConfig   *config;
+    const char *rootDir;
     int                i;
     int                changed;
     int                ret;
 #if HAVE_GETOPT_LONG || HAVE_GETOPT
     int                c;
 
+FcBool convert = FcFalse;
+
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "frsVvh", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "cfrR:sVvh", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "frsVvh")) != -1)
+    while ((c = getopt (argc, argv, "cfrR:sVvh")) != -1)
 #endif
     {
        switch (c) {
+       case 'c':
+           convert = FcTrue;
+           break;
        case 'r':
            really_force = FcTrue;
            /* fall through */
        case 'f':
            force = FcTrue;
            break;
+       case 'R':
+           rootDir = optarg;
+           break;
        case 's':
            systemOnly = FcTrue;
            break;
@@ -409,6 +429,20 @@ main (int argc, char **argv)
     i = 1;
 #endif
 
+    if (convert)
+    {
+       const FcChar8 *src_cache, *dst_cache, *src_type, *dst_type;
+
+       src_cache = (const FcChar8 *) argv[i++];
+       src_type = (const FcChar8 *) argv[i++];
+       dst_cache = (const FcChar8 *) argv[i++];
+       dst_type = (const FcChar8 *) argv[i++];
+
+       FcDirCacheConvert (src_cache, src_type, dst_cache, dst_type);
+
+       return 0;
+    }
+
     if (systemOnly)
        FcConfigEnableHome (FcFalse);
     config = FcInitLoadConfig ();
@@ -418,6 +452,7 @@ main (int argc, char **argv)
        return 1;
     }
     FcConfigSetCurrent (config);
+    FcConfigSetRoot (config, (const FcChar8 *) rootDir);
 
     if (argv[i])
     {