X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fdb.cpp;h=783b079963900cb5800a71d5a22e9b068dfb95f9;hb=4664aae3fe2eba4eec84d20f1e7e701ceeeb49bd;hp=023dc5947a2a43223322dd91c21c8e8cc6c95fed;hpb=1aafd7464f67e0ba42b18a08070a86a427e28c72;p=novacoin.git

diff --git a/src/db.cpp b/src/db.cpp
index 023dc59..783b079 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2011 The Bitcoin developers
+// Copyright (c) 2009-2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
@@ -28,7 +28,7 @@ DbEnv dbenv(0);
 static map<string, int> mapFileUseCount;
 static map<string, Db*> mapDb;
 
-static void EnvShutdown(bool fRemoveLogFiles)
+static void EnvShutdown()
 {
     if (!fDbEnvInit)
         return;
@@ -43,24 +43,6 @@ static void EnvShutdown(bool fRemoveLogFiles)
         printf("EnvShutdown exception: %s (%d)\n", e.what(), e.get_errno());
     }
     DbEnv(0).remove(GetDataDir().c_str(), 0);
-
-    if (fRemoveLogFiles)
-    {
-        filesystem::path datadir(GetDataDir());
-        filesystem::directory_iterator it(datadir / "database");
-        while (it != filesystem::directory_iterator())
-        {
-            const filesystem::path& p = it->path();
-#if BOOST_FILESYSTEM_VERSION == 3
-            std::string f = p.filename().generic_string();
-#else
-            std::string f = p.filename();
-#endif
-            if (f.find("log.") == 0)
-                filesystem::remove(p);
-            ++it;
-        }
-    }
 }
 
 class CDBInit
@@ -71,7 +53,7 @@ public:
     }
     ~CDBInit()
     {
-        EnvShutdown(false);
+        EnvShutdown();
     }
 }
 instance_of_cdbinit;
@@ -213,61 +195,63 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
                 bool fSuccess = true;
                 printf("Rewriting %s...\n", strFile.c_str());
                 string strFileRes = strFile + ".rewrite";
-                CDB db(strFile.c_str(), "r");
-                Db* pdbCopy = new Db(&dbenv, 0);
-
-                int ret = pdbCopy->open(NULL,                 // Txn pointer
-                                        strFileRes.c_str(),   // Filename
-                                        "main",    // Logical db name
-                                        DB_BTREE,  // Database type
-                                        DB_CREATE,    // Flags
-                                        0);
-                if (ret > 0)
-                {
-                    printf("Cannot create database file %s\n", strFileRes.c_str());
-                    fSuccess = false;
-                }
-
-                Dbc* pcursor = db.GetCursor();
-                if (pcursor)
-                    while (fSuccess)
+                { // surround usage of db with extra {}
+                    CDB db(strFile.c_str(), "r");
+                    Db* pdbCopy = new Db(&dbenv, 0);
+    
+                    int ret = pdbCopy->open(NULL,                 // Txn pointer
+                                            strFileRes.c_str(),   // Filename
+                                            "main",    // Logical db name
+                                            DB_BTREE,  // Database type
+                                            DB_CREATE,    // Flags
+                                            0);
+                    if (ret > 0)
                     {
-                        CDataStream ssKey;
-                        CDataStream ssValue;
-                        int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT);
-                        if (ret == DB_NOTFOUND)
-                        {
-                            pcursor->close();
-                            break;
-                        }
-                        else if (ret != 0)
-                        {
-                            pcursor->close();
-                            fSuccess = false;
-                            break;
-                        }
-                        if (pszSkip &&
-                            strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
-                            continue;
-                        if (strncmp(&ssKey[0], "\x07version", 8) == 0)
+                        printf("Cannot create database file %s\n", strFileRes.c_str());
+                        fSuccess = false;
+                    }
+    
+                    Dbc* pcursor = db.GetCursor();
+                    if (pcursor)
+                        while (fSuccess)
                         {
-                            // Update version:
-                            ssValue.clear();
-                            ssValue << VERSION;
+                            CDataStream ssKey;
+                            CDataStream ssValue;
+                            int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT);
+                            if (ret == DB_NOTFOUND)
+                            {
+                                pcursor->close();
+                                break;
+                            }
+                            else if (ret != 0)
+                            {
+                                pcursor->close();
+                                fSuccess = false;
+                                break;
+                            }
+                            if (pszSkip &&
+                                strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
+                                continue;
+                            if (strncmp(&ssKey[0], "\x07version", 8) == 0)
+                            {
+                                // Update version:
+                                ssValue.clear();
+                                ssValue << VERSION;
+                            }
+                            Dbt datKey(&ssKey[0], ssKey.size());
+                            Dbt datValue(&ssValue[0], ssValue.size());
+                            int ret2 = pdbCopy->put(NULL, &datKey, &datValue, DB_NOOVERWRITE);
+                            if (ret2 > 0)
+                                fSuccess = false;
                         }
-                        Dbt datKey(&ssKey[0], ssKey.size());
-                        Dbt datValue(&ssValue[0], ssValue.size());
-                        int ret2 = pdbCopy->put(NULL, &datKey, &datValue, DB_NOOVERWRITE);
-                        if (ret2 > 0)
+                    if (fSuccess)
+                    {
+                        db.Close();
+                        CloseDb(strFile);
+                        if (pdbCopy->close(0))
                             fSuccess = false;
+                        delete pdbCopy;
                     }
-                if (fSuccess)
-                {
-                    db.Close();
-                    CloseDb(strFile);
-                    if (pdbCopy->close(0))
-                        fSuccess = false;
-                    delete pdbCopy;
                 }
                 if (fSuccess)
                 {
@@ -289,7 +273,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
 }
 
 
-void DBFlush(bool fShutdown, bool fRemoveLogFiles)
+void DBFlush(bool fShutdown)
 {
     // Flush log data to the actual data file
     //  on all files that are not in use
@@ -322,7 +306,7 @@ void DBFlush(bool fShutdown, bool fRemoveLogFiles)
             if (mapFileUseCount.empty())
             {
                 dbenv.log_archive(&listp, DB_ARCH_REMOVE);
-                EnvShutdown(fRemoveLogFiles);
+                EnvShutdown();
             }
         }
     }
@@ -895,12 +879,16 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
                     CPrivKey pkey;
                     ssValue >> pkey;
                     key.SetPrivKey(pkey);
+                    if (key.GetPubKey() != vchPubKey || !key.IsValid())
+                        return DB_CORRUPT;
                 }
                 else
                 {
                     CWalletKey wkey;
                     ssValue >> wkey;
                     key.SetPrivKey(wkey.vchPrivKey);
+                    if (key.GetPubKey() != vchPubKey || !key.IsValid())
+                        return DB_CORRUPT;
                 }
                 if (!pwallet->LoadKey(key))
                     return DB_CORRUPT;