From ccda03b57022369c4352d0f5a816cff9ace833e6 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 24 Apr 2013 00:43:14 +0200
Subject: [PATCH] Remove database/ after clean shutdown

---
 src/db.cpp | 10 ++++++----
 src/db.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/db.cpp b/src/db.cpp
index 35d6cca8..52d613bc 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -38,7 +38,7 @@ void CDBEnv::EnvShutdown()
     if (ret != 0)
         printf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret);
     if (!fMockDb)
-        DbEnv(0).remove(strPath.c_str(), 0);
+        DbEnv(0).remove(path.string().c_str(), 0);
 }
 
 CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS)
@@ -57,14 +57,14 @@ void CDBEnv::Close()
     EnvShutdown();
 }
 
-bool CDBEnv::Open(const boost::filesystem::path& path)
+bool CDBEnv::Open(const boost::filesystem::path& pathIn)
 {
     if (fDbEnvInit)
         return true;
 
     boost::this_thread::interruption_point();
 
-    strPath = path.string();
+    path = pathIn;
     filesystem::path pathLogDir = path / "database";
     filesystem::create_directory(pathLogDir);
     filesystem::path pathErrorFile = path / "db.log";
@@ -84,7 +84,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path)
     dbenv.set_flags(DB_AUTO_COMMIT, 1);
     dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
     dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
-    int ret = dbenv.open(strPath.c_str(),
+    int ret = dbenv.open(path.string().c_str(),
                      DB_CREATE     |
                      DB_INIT_LOCK  |
                      DB_INIT_LOG   |
@@ -456,6 +456,8 @@ void CDBEnv::Flush(bool fShutdown)
             {
                 dbenv.log_archive(&listp, DB_ARCH_REMOVE);
                 Close();
+                if (!fMockDb)
+                    boost::filesystem::remove_all(path / "database");
             }
         }
     }
diff --git a/src/db.h b/src/db.h
index 206da91e..ea440c49 100644
--- a/src/db.h
+++ b/src/db.h
@@ -33,7 +33,7 @@ class CDBEnv
 private:
     bool fDbEnvInit;
     bool fMockDb;
-    std::string strPath;
+    boost::filesystem::path path;
 
     void EnvShutdown();