Update fc-cat to handle subdir lists in global cache file.

Another FcCacheReadString return value check.

diff --git a/ChangeLog b/ChangeLog
index 4755e7fb4e16fbd4a5dde709960449ff275212ad..5057b59c61b2f9bf61af2bd966bb247848f887c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-30  Patrick Lam  <plam@mit.edu>
+       * fc-cat/fc-cat.c (FcCacheGlobalFileReadAndPrint):
+       
+       Update fc-cat to handle subdir lists in global cache file.
+       
+       * src/fccache.c (FcGlobalCacheLoad):
+       
+       Another FcCacheReadString return value check.
+
 2006-01-30  Mike Fabian  <mfabian@suse.de>
        reviewed by: plam
 

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index 3b24302dee0805d61dd079c21030fdfaf71f2bdb..a203d7496f2097bbb91f75841c7a135a459e0f68 100644 (file)
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -174,6 +174,7 @@ FcCacheGlobalFileReadAndPrint (FcFontSet * set, FcStrSet *dirs, char *cache_file
     int fd;
     char * current_arch_machine_name;
     char candidate_arch_machine_name[9+MACHINE_SIGNATURE_SIZE];
+    char               subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1];
     off_t current_arch_start = 0;
 
     if (!cache_file)
@@ -202,6 +203,15 @@ FcCacheGlobalFileReadAndPrint (FcFontSet * set, FcStrSet *dirs, char *cache_file
        printf ("fc-cat: printing global cache contents for dir %s\n", 
                name_buf);
 
+       do
+       {
+           if (!FcCacheReadString (fd, subdirName, 
+                                   sizeof (subdirName)) ||
+               !strlen (subdirName))
+               break;
+           /* then don't do anything with subdirName. */
+       } while (1);
+
        if (!FcDirCacheConsume (fd, name_buf, set, 0))
            goto bail1;
 

diff --git a/src/fccache.c b/src/fccache.c
index 5af247a13ff23b9ce9e9185f4b45dfebdff81fd9..3dd7eae3ba790c2025853a54d2cb9bd19df1eb9e 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -240,7 +240,8 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
     {
        off_t targ;
 
-       if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)) || !strlen(name_buf))
+       if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)) || 
+           !strlen(name_buf))
            break;
 
        /* Directory must be older than the global cache file; also
@@ -269,8 +270,14 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
        d->offset = lseek (cache->fd, 0, SEEK_CUR);
 
        d->subdirs = FcStrSetCreate();
-       while (strlen(FcCacheReadString (cache->fd, subdirName, sizeof (subdirName))) > 0)
+       do
+       {
+           if (!FcCacheReadString (cache->fd, subdirName, 
+                                   sizeof (subdirName)) ||
+               !strlen (subdirName))
+               break;
            FcStrSetAdd (d->subdirs, (FcChar8 *)subdirName);
+       } while (1);
 
        if (read (cache->fd, &d->metadata, sizeof (FcCache)) != sizeof (FcCache))
            goto bail1;