Enable fc-cat to print out old-style cache info when given a directory

    name.

diff --git a/ChangeLog b/ChangeLog
index 220470af67996e7c1fa0a7dfd87885fa56e6d3e3..6a45d92f89b329dda43bf1bad4e08d81fcba8729 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-17  Patrick Lam  <plam@mit.edu>
+       * fc-cat/fc-cat.c (main):
+
+       Enable fc-cat to print out old-style cache info when given a
+       directory name.
+
 2006-02-16  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcDirCacheHasCurrentArch):
 

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index d6247114f227935898581f635d3e38eea301e59d..f466e3ecbc62f3af09f1dd8feef1b698d5e44391 100644 (file)
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -377,6 +377,16 @@ bail2:
     return FcFalse;
 }
 
+FcBool
+FcFileIsDir (const FcChar8 *file)
+{
+    struct stat            statb;
+
+    if (stat ((const char *) file, &statb) != 0)
+       return FcFalse;
+    return S_ISDIR(statb.st_mode);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -410,7 +420,21 @@ main (int argc, char **argv)
     if (i >= argc)
         usage (argv[0]);
 
-    if ((name_buf = FcCacheFileRead (fs, dirs, argv[i])) != 0)
+    if (FcFileIsDir ((const FcChar8 *)argv[i]))
+    {
+        char * dummy_name = (char *)FcStrPlus ((FcChar8 *)argv[i], 
+                                               (FcChar8 *)"/dummy");
+        if (!FcDirScanConfig (fs, dirs, 0, 0, 
+                              (const FcChar8 *)argv[i], FcFalse, 0))
+            fprintf (stderr, "couldn't load font dir %s\n", argv[i]);
+        else
+        {
+            /* sorry, we can't tell you where the cache file is. */
+            FcCachePrintSet (fs, dirs, dummy_name);
+            FcStrFree ((FcChar8 *)dummy_name);
+        }
+    }
+    else if ((name_buf = FcCacheFileRead (fs, dirs, argv[i])) != 0)
        FcCachePrintSet (fs, dirs, name_buf);
     else
     {