Don't use identifier named complex

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index bb5cfc9321d6cf3be09998d97c99ce2dae2ca3f4..51664087c2a4f5d224917e92b6aa71cad6504c6f 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -1,5 +1,5 @@
 /*
- * $RCSId: xc/lib/fontconfig/src/fcdir.c,v 1.9 2002/08/31 22:17:32 keithp Exp $
+ * fontconfig/src/fcdir.c
  *
  * Copyright © 2000 Keith Packard
  *
@@ -30,7 +30,7 @@ FcFileIsDir (const FcChar8 *file)
 {
     struct stat            statb;
 
-    if (stat ((const char *) file, &statb) != 0)
+    if (FcStat ((const char *) file, &statb) != 0)
        return FcFalse;
     return S_ISDIR(statb.st_mode);
 }
@@ -65,7 +65,7 @@ FcFileScanFontConfig (FcFontSet               *set,
        /*
         * Edit pattern with user-defined rules
         */
-       if (config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan))
+       if (font && config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan))
        {
            FcPatternDestroy (font);
            font = NULL;
@@ -146,6 +146,7 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
     int                        i;
     FcBlanks           *blanks = FcConfigGetBlanks (config);
     FcCache            *cache = NULL;
+    struct stat                dir_stat;
 
     if (FcDebug () & FC_DBG_FONTSET)
        printf ("cache scan dir %s\n", dir);
@@ -174,6 +175,11 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
            ret = FcFalse;
        goto bail_1;
     }
+    if (FcStat ((char *) dir, &dir_stat) < 0)
+    {
+       ret = FcFalse;
+       goto bail_1;
+    }
 
     set = FcFontSetCreate();
     if (!set) 
@@ -218,7 +224,7 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
     /*
      * Build the cache object
      */
-    cache = FcDirCacheBuild (set, dir, dirs);
+    cache = FcDirCacheBuild (set, dir, &dir_stat, dirs);
     if (!cache)
        goto bail3;
     
@@ -273,7 +279,7 @@ FcDirScanConfig (FcFontSet  *set,
                 FcBool         force,
                 FcConfig       *config)
 {
-    return FcFalse; /* XXX fixme */
+    return FcFalse; /* XXX deprecated */
 }
 
 FcBool
@@ -284,7 +290,7 @@ FcDirScan (FcFontSet            *set,
           const FcChar8    *dir,
           FcBool           force)
 {
-    return FcDirScanConfig (set, dirs, blanks, dir, force, NULL);
+    return FcFalse; /* XXX deprecated */
 }
 
 FcBool