[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 fc-cache/fc-cache.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit db64c71408636e2d0ac3c39682ac1b6c8f317ac4
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Dec 16 20:43:02 2014 +0900

    fc-cache: make a fail if no fonts processed on a given path

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 406ac6a..e85c9fc 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -126,7 +126,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
     FcStrList	    *sublist;
     FcCache	    *cache;
     struct stat	    statb;
-    FcBool	    was_valid;
+    FcBool	    was_valid, was_processed = FcFalse;
     int		    i;
     const FcChar8   *sysroot = FcConfigGetSysRoot (config);
 
@@ -175,6 +175,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
 	    fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
 	    continue;
 	}
+	was_processed = FcTrue;
 
 	if (really_force)
 	    FcDirCacheUnlink (dir, config);
@@ -256,6 +257,8 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
 	else
 	    FcDirCacheUnload (cache);
     }
+    if (!was_processed)
+	ret++;
     return ret;
 }