From 285dd05072ccccbe6cf42d5fa49d92d49470fb90 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Tue, 3 May 2016 22:21:06 -0700
Subject: [PATCH] When counting blocks, ignore cryfs.config. This already
 worked on Linux, but not on Mac. After this commit, it is also fixed for Mac.

---
 src/blockstore/implementations/ondisk/OnDiskBlockStore.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/blockstore/implementations/ondisk/OnDiskBlockStore.cpp b/src/blockstore/implementations/ondisk/OnDiskBlockStore.cpp
index 01616440..a3ea3bb6 100644
--- a/src/blockstore/implementations/ondisk/OnDiskBlockStore.cpp
+++ b/src/blockstore/implementations/ondisk/OnDiskBlockStore.cpp
@@ -78,7 +78,9 @@ void OnDiskBlockStore::remove(unique_ref<Block> block) {
 uint64_t OnDiskBlockStore::numBlocks() const {
   uint64_t count = 0;
   for (auto entry = bf::directory_iterator(_rootdir); entry != bf::directory_iterator(); ++entry) {
-    count += std::distance(bf::directory_iterator(entry->path()), bf::directory_iterator());
+    if (bf::is_directory(entry->path())) {
+      count += std::distance(bf::directory_iterator(entry->path()), bf::directory_iterator());
+    }
   }
   return count;
 }