FcBool ret = FcTrue;
FcBool remove;
FcCache *cache;
- struct stat file_stat;
struct stat target_stat;
dir_base = FcStrPlus (dir, (FcChar8 *) "/");
fprintf (stderr, "%s: out of memory\n", dir);
return FcFalse;
}
- if (access ((char *) dir, W_OK|X_OK) != 0)
+ if (access ((char *) dir, W_OK) != 0)
{
if (verbose)
- printf ("%s: not cleaning unwritable cache directory\n", dir);
+ printf ("%s: not cleaning %s cache directory\n", dir,
+ access ((char *) dir, F_OK) == 0 ? "unwritable" : "non-existent");
FcStrFree (dir_base);
return FcTrue;
}
ret = FcFalse;
break;
}
- cache = FcDirCacheLoadFile (file_name, &file_stat);
- if (!cache)
- {
- fprintf (stderr, "%s: invalid cache file: %s\n", dir, ent->d_name);
- FcStrFree (file_name);
- ret = FcFalse;
- continue;
- }
- target_dir = FcCacheDir (cache);
remove = FcFalse;
- if (stat ((char *) target_dir, &target_stat) < 0)
+ cache = FcDirCacheLoadFile (file_name, NULL);
+ if (!cache)
{
if (verbose)
- printf ("%s: %s: missing directory: %s \n",
- dir, ent->d_name, target_dir);
+ printf ("%s: invalid cache file: %s\n", dir, ent->d_name);
remove = FcTrue;
}
- else if (target_stat.st_mtime > file_stat.st_mtime)
+ else
{
- if (verbose)
- printf ("%s: %s: cache outdated: %s\n",
- dir, ent->d_name, target_dir);
- remove = FcTrue;
+ target_dir = FcCacheDir (cache);
+ if (stat ((char *) target_dir, &target_stat) < 0)
+ {
+ if (verbose)
+ printf ("%s: %s: missing directory: %s \n",
+ dir, ent->d_name, target_dir);
+ remove = FcTrue;
+ }
}
if (remove)
{