Remove unneeded call to access(2) in fc-cache.

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

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index bda8b1468cfa7a0504cac35a821a186070ed0b2a..0415b54762268222f1acbe6e66336ace1e708a4a 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -22,6 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "../fc-arch/fcarch.h"
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
@@ -40,6 +42,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <string.h>
 
 #if defined (_WIN32)
 #define STRICT
@@ -150,35 +153,23 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
            continue;
        }
 
-       if (access ((char *) dir, W_OK) < 0)
+       if (stat ((char *) dir, &statb) == -1)
        {
            switch (errno) {
            case ENOENT:
            case ENOTDIR:
                if (verbose)
                    printf ("skipping, no such directory\n");
-               continue;
-           case EACCES:
-           case EROFS:
-               /* That's ok, caches go to /var anyway. */
-               /* Ideally we'd do an access on the hashed_name. */
-               /* But we hid that behind an abstraction barrier. */
                break;
            default:
                fprintf (stderr, "\"%s\": ", dir);
                perror ("");
                ret++;
-
-               continue;
+               break;
            }
-       }
-       if (stat ((char *) dir, &statb) == -1)
-       {
-           fprintf (stderr, "\"%s\": ", dir);
-           perror ("");
-           ret++;
            continue;
        }
+
        if (!S_ISDIR (statb.st_mode))
        {
            fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
@@ -296,6 +287,12 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
 
        if (ent->d_name[0] == '.')
            continue;
+       /* skip cache files for different architectures and */
+       /* files which are not cache files at all */
+       if (strlen(ent->d_name) != 32 + strlen ("-" FC_ARCHITECTURE FC_CACHE_SUFFIX) ||
+           strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX))
+           continue;
+       
        file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
        if (!file_name)
        {