X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcdir.c;h=3aeb4c98da80f5a0529262a2628244c864b29e78;hb=2d3387fd720f33f80847ae6cbb83d94c9a52fde3;hp=bc8322b487dde45d1b66e74eefcd6740f8649ccf;hpb=e3c6d3364c79838e5c30de072b97f7f091b1f81d;p=fontconfig.git

diff --git a/src/fcdir.c b/src/fcdir.c
index bc8322b..3aeb4c9 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -35,26 +35,17 @@ FcFileIsDir (const FcChar8 *file)
     return S_ISDIR(statb.st_mode);
 }
 
-FcBool
-FcFileScanConfig (FcFontSet	*set,
-		  FcStrSet	*dirs,
-		  FcGlobalCache *cache,
-		  FcBlanks	*blanks,
-		  const FcChar8	*file,
-		  FcBool	force,
-		  FcConfig	*config)
+static FcBool
+FcFileScanFontConfig (FcFontSet		*set,
+		      FcBlanks		*blanks,
+		      const FcChar8	*file,
+		      FcConfig		*config)
 {
-    int			id;
-    FcPattern		*font;
-    FcBool		ret = FcTrue;
-    int			count = 0;
+    FcPattern	*font;
+    FcBool	ret = FcTrue;
+    int		id;
+    int		count = 0;
     
-    if (config && !FcConfigAcceptFilename (config, file))
-	return FcTrue;
-
-    if (FcFileIsDir (file))
-	return FcStrSetAdd (dirs, file);
-
     id = 0;
     do
     {
@@ -89,15 +80,32 @@ FcFileScanConfig (FcFontSet	*set,
     return ret;
 }
 
+FcBool
+FcFileScanConfig (FcFontSet	*set,
+		  FcStrSet	*dirs,
+		  FcBlanks	*blanks,
+		  const FcChar8	*file,
+		  FcBool	force,
+		  FcConfig	*config)
+{
+    if (config && !FcConfigAcceptFilename (config, file))
+	return FcTrue;
+
+    if (FcFileIsDir (file))
+	return FcStrSetAdd (dirs, file);
+    else
+	return FcFileScanFontConfig (set, blanks, file, config);
+}
+
 FcBool
 FcFileScan (FcFontSet	    *set,
 	    FcStrSet	    *dirs,
-	    FcGlobalCache   *cache,
+	    FcFileCache	    *cache, /* XXX unused */
 	    FcBlanks	    *blanks,
 	    const FcChar8   *file,
 	    FcBool	    force)
 {
-    return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
+    return FcFileScanConfig (set, dirs, blanks, file, force, 0);
 }
 
 /*
@@ -118,144 +126,167 @@ cmpstringp(const void *p1, const void *p2)
 FcBool
 FcDirScanConfig (FcFontSet	*set,
 		 FcStrSet	*dirs,
-		 FcGlobalCache  *cache,
 		 FcBlanks	*blanks,
 		 const FcChar8  *dir,
 		 FcBool		force,
 		 FcConfig	*config)
 {
     DIR			*d;
+    FcChar8		*canon_dir;
     struct dirent	*e;
-    FcChar8		**dirlist;
-    int			dirlistlen, dirlistalloc;
+    FcStrSet		*dirlist, *filelist;
     FcChar8		*file;
-    const FcChar8	*d_can = 0;
     FcChar8		*base;
     FcBool		ret = FcTrue;
     FcFontSet		*tmpSet;
     int			i;
 
-    if (config && !FcConfigAcceptFilename (config, dir))
-	return FcTrue;
-
-    if (config)
-	d_can = FcConfigNormalizeFontDir (config, dir);
-    if (d_can)
-	dir = d_can;
+    canon_dir = FcStrCanonFilename (dir);
+    if (!canon_dir) canon_dir = (FcChar8 *) dir;
+    
+    if (config && !FcConfigAcceptFilename (config, canon_dir)) {
+	ret = FcTrue;
+	goto bail;
+    }
 
     if (!force)
     {
-	/*
-	 * Check ~/.fonts.cache-<version> file
-	 */
-	if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
-	    return FcTrue;
-
-	if (FcDirCacheValid (dir) && 
-	    FcDirCacheHasCurrentArch (dir) &&
-	    FcDirCacheRead (set, dirs, dir, config))
-	    return FcTrue;
+	if (FcDirCacheRead (set, dirs, canon_dir, config)) {
+	    ret = FcTrue;
+	    goto bail;
+	}
     }
     
+    if (FcDebug () & FC_DBG_FONTSET)
+    	printf ("cache scan dir %s\n", canon_dir);
+
     /* freed below */
-    file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
-    if (!file)
-	return FcFalse;
+    file = (FcChar8 *) malloc (strlen ((char *) canon_dir) + 1 + FC_MAX_FILE_LEN + 1);
+    if (!file) {
+	ret = FcFalse;
+	goto bail;
+    }
 
-    strcpy ((char *) file, (char *) dir);
+    strcpy ((char *) file, (char *) canon_dir);
     strcat ((char *) file, "/");
     base = file + strlen ((char *) file);
     
     if (FcDebug () & FC_DBG_SCAN)
-	printf ("\tScanning dir %s\n", dir);
+	printf ("\tScanning dir %s\n", canon_dir);
 	
-    d = opendir ((char *) dir);
+    d = opendir ((char *) canon_dir);
     if (!d)
     {
-	free (file);
 	/* Don't complain about missing directories */
 	if (errno == ENOENT)
-	    return FcTrue;
-	return FcFalse;
+	    ret = FcTrue;
+	else
+	    ret = FcFalse;
+	goto bail_1;
     }
 
     tmpSet = FcFontSetCreate();
-    if (!tmpSet)
-    {	
-	free (file);
-	return FcFalse;
+    if (!tmpSet) 
+    {
+	ret = FcFalse;
+	goto bail0;
     }
 
-    dirlistlen = 0;
-    dirlistalloc = 8;
-    dirlist = malloc(dirlistalloc * sizeof(FcChar8 *));
-    if (!dirlist)
-       return FcFalse;
+    dirlist = FcStrSetCreate ();
+    if (!dirlist) 
+    {
+	ret = FcFalse;
+	goto bail1;
+    }
+    filelist = FcStrSetCreate ();
+    if (!filelist)
+    {
+	ret = FcFalse;
+	goto bail2;
+    }
     while ((e = readdir (d)))
     {
 	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
 	{
-	    if (dirlistlen == dirlistalloc)
-	    {
-		dirlistalloc *= 2;
-		dirlist = realloc(dirlist, dirlistalloc * sizeof(FcChar8 *));
-		if (!dirlist)
-		    return FcFalse;
+	    strcpy ((char *) base, (char *) e->d_name);
+	    if (FcFileIsDir (file)) {
+		if (!FcStrSetAdd (dirlist, file)) {
+		    ret = FcFalse;
+		    goto bail3;
+		}
+	    } else {
+		if (!FcStrSetAdd (filelist, file)) {
+		    ret = FcFalse;
+		    goto bail3;
+		}
 	    }
-	    dirlist[dirlistlen] = malloc(strlen (e->d_name) + 1);
-	    if (!dirlist[dirlistlen])
-		return FcFalse;
-	    strcpy(dirlist[dirlistlen], e->d_name);
-	    dirlistlen++;
 	}
     }
-    qsort(dirlist, dirlistlen, sizeof(FcChar8 *), cmpstringp);
-    i = 0;
-    while (ret && i < dirlistlen)
-    {
-	strcpy ((char *) base, (char *) dirlist[i]);
-	ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config);
-	i++;
-    }
-    for (i = 0; i < dirlistlen; i++)
-	free(dirlist[i]);
-    free (dirlist);
-    free (file);
-    closedir (d);
+    /*
+     * Sort files and dirs to make things prettier
+     */
+    qsort(dirlist->strs, dirlist->num, sizeof(FcChar8 *), cmpstringp);
+    qsort(filelist->strs, filelist->num, sizeof(FcChar8 *), cmpstringp);
+    
+    for (i = 0; i < filelist->num; i++)
+	FcFileScanFontConfig (tmpSet, blanks, filelist->strs[i], config);
+    
     /*
      * Now that the directory has been scanned,
-     * add the cache entry 
+     * write out the cache file
      */
-    if (ret && cache)
-	FcGlobalCacheUpdate (cache, dirs, (char *)dir, tmpSet, config);
+    FcDirCacheWrite (tmpSet, dirlist, canon_dir, config);
 
+    /*
+     * Add the discovered fonts to our internal non-cache list
+     */
     for (i = 0; i < tmpSet->nfont; i++)
 	FcFontSetAdd (set, tmpSet->fonts[i]);
 
-    if (tmpSet->fonts)
-    {
-	FcMemFree (FC_MEM_FONTPTR, tmpSet->sfont * sizeof (FcPattern *));
-	free (tmpSet->fonts);
-    }
-    FcMemFree (FC_MEM_FONTSET, sizeof (FcFontSet));
-    free (tmpSet);
-	
+    /*
+     * the patterns in tmpset now belong to set; don't free them 
+     */
+    tmpSet->nfont = 0;
+
+    /*
+     * Add the discovered directories to the list to be scanned
+     */
+    for (i = 0; i < dirlist->num; i++)
+	if (!FcStrSetAdd (dirs, dirlist->strs[i])) {
+	    ret = FcFalse;
+	    goto bail3;
+	}
+    
+ bail3:
+    FcStrSetDestroy (filelist);
+ bail2:
+    FcStrSetDestroy (dirlist);
+ bail1:
+    FcFontSetDestroy (tmpSet);
+    
+ bail0:
+    closedir (d);
+    
+ bail_1:
+    free (file);
+ bail:
+    if (canon_dir != dir) free (canon_dir);
     return ret;
 }
 
 FcBool
 FcDirScan (FcFontSet	    *set,
 	   FcStrSet	    *dirs,
-	   FcGlobalCache    *cache,
+	   FcFileCache	    *cache, /* XXX unused */
 	   FcBlanks	    *blanks,
 	   const FcChar8    *dir,
 	   FcBool	    force)
 {
-    return FcDirScanConfig (set, dirs, cache, blanks, dir, force, 0);
+    return FcDirScanConfig (set, dirs, blanks, dir, force, 0);
 }
 
 FcBool
 FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
 {
-    return FcDirCacheWrite (set, dirs, dir);
+    return FcFalse;
 }