Change RCS tag

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

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index b3d0f3f80ba6e1175b3eefa92ed400013a1fbfdf..be8b962596cbdadb20a7a8d85a4447ade22b11b6 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.2 2002/02/15 07:36:14 keithp Exp $
+ * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $
  *
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2002 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -24,7 +24,11 @@
 
 #include <fontconfig/fontconfig.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
@@ -47,6 +51,7 @@
 #include <getopt.h>
 const struct option longopts[] = {
     {"force", 0, 0, 'f'},
+    {"system-only", 0, 0, 's'},
     {"version", 0, 0, 'V'},
     {"verbose", 0, 0, 'v'},
     {"help", 0, 0, '?'},
@@ -67,7 +72,8 @@ usage (char *program)
     fprintf (stderr, "Build font information caches in [dirs]\n"
             "(all directories in font configuration by default).\n");
     fprintf (stderr, "\n");
-    fprintf (stderr, "  -v, --force          scan directories with apparently valid caches\n");
+    fprintf (stderr, "  -f, --force          scan directories with apparently valid caches\n");
+    fprintf (stderr, "  -s, --system-only    scan system-wide directories only\n");
     fprintf (stderr, "  -v, --verbose        display status information while busy\n");
     fprintf (stderr, "  -V, --version        display font config version and exit\n");
     fprintf (stderr, "  -?, --help           display this help and exit\n");
@@ -90,13 +96,14 @@ nsubdirs (FcStrSet *set)
 }
 
 static int
-scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
+scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool verbose)
 {
     int                ret = 0;
     FcChar8    *dir;
     FcFontSet  *set;
     FcStrSet   *subdirs;
     FcStrList  *sublist;
+    struct stat        statb;
     
     /*
      * Now scan all of the directories into separate databases
@@ -123,9 +130,42 @@ scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
            ret++;
            continue;
        }
-       if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (0), dir, force))
+       
+       if (access ((char *) dir, W_OK) < 0)
        {
-           fprintf (stderr, "Can't scan \"%s\"\n", dir);
+           switch (errno) {
+           case ENOENT:
+           case ENOTDIR:
+               if (verbose)
+                   printf ("skipping, no such directory\n");
+               break;
+           case EACCES:
+           case EROFS:
+               if (verbose)
+                   printf ("skipping, no write access\n");
+               break;
+           default:
+               fprintf (stderr, "\"%s\": ", dir);
+               perror ("");
+               ret++;
+           }
+           continue;
+       }
+       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);
+           continue;
+       }
+       if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, force))
+       {
+           fprintf (stderr, "\"%s\": error scanning\n", dir);
            ret++;
            continue;
        }
@@ -154,7 +194,7 @@ scanDirs (FcStrList *list, char *program, FcBool force, FcBool verbose)
            ret++;
            continue;
        }
-       ret += scanDirs (sublist, program, force, verbose);
+       ret += scanDirs (sublist, config, program, force, verbose);
        FcStrSetDestroy (subdirs);
     }
     FcStrListDone (list);
@@ -168,6 +208,7 @@ main (int argc, char **argv)
     FcStrList  *list;
     FcBool     verbose = FcFalse;
     FcBool     force = FcFalse;
+    FcBool     systemOnly = FcFalse;
     FcConfig   *config;
     int                i;
     int                ret;
@@ -184,6 +225,9 @@ main (int argc, char **argv)
        case 'f':
            force = FcTrue;
            break;
+       case 's':
+           systemOnly = FcTrue;
+           break;
        case 'V':
            fprintf (stderr, "fontconfig version %d.%d.%d\n", 
                     FC_MAJOR, FC_MINOR, FC_REVISION);
@@ -200,6 +244,8 @@ main (int argc, char **argv)
     i = 1;
 #endif
 
+    if (systemOnly)
+       FcConfigEnableHome (FcFalse);
     config = FcInitLoadConfig ();
     if (!config)
     {
@@ -229,7 +275,7 @@ main (int argc, char **argv)
     }
     else
        list = FcConfigGetConfigDirs (config);
-    ret = scanDirs (list, argv[0], force, verbose);
+    ret = scanDirs (list, config, argv[0], force, verbose);
     if (verbose)
        printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded");
     return ret;