Mercurial > hg > bitcoin
changeset 197:b887c22e68fd draft
switched from wxStandardPaths to GetDefaultDataDir, fixes bug reported by m0mchil when username contains non-lower-ASCII characters
-- version 0.3.1
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@102 1a98c847-1fd6-4fd8-948a-caf3550aa51b
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
|---|---|
| date | Fri, 09 Jul 2010 15:29:48 +0000 |
| parents | 504786323858 |
| children | e5950b5ebb02 |
| files | init.cpp serialize.h util.cpp util.h |
| diffstat | 4 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/init.cpp +++ b/init.cpp @@ -4,8 +4,6 @@ #include "headers.h" -extern string GetDefaultDataDir(); /// todo: delete this later, just used by debug test - @@ -430,15 +428,7 @@ printf("Bitcoin version %d.%d.%d%s beta, OS version %s\n", VERSION/10000, (VERSION/100)%100, VERSION%100, pszSubVer, ((string)wxGetOsDescription()).c_str()); printf("System default language is %d %s\n", m_locale.GetSystemLanguage(), ((string)m_locale.GetSysName()).c_str()); printf("Language file %s (%s)\n", (string("locale/") + (string)m_locale.GetCanonicalName() + "/LC_MESSAGES/bitcoin.mo").c_str(), ((string)m_locale.GetLocale()).c_str()); - - /// debug - for now, just watching if these match - if (pszSetDataDir[0] == 0) - { - if (GetDefaultDataDir() != GetDataDir()) - printf("**** GetDefaultDataDir() %s != %s\n", GetDefaultDataDir().c_str(), GetDataDir().c_str()); - else - printf("OK GetDefaultDataDir() %s == %s\n", GetDefaultDataDir().c_str(), GetDataDir().c_str()); - } + printf("Default data directory %s\n", GetDefaultDataDir().c_str()); if (mapArgs.count("-loadblockindextest")) {
--- a/serialize.h +++ b/serialize.h @@ -19,8 +19,8 @@ class CDataStream; class CAutoFile; -static const int VERSION = 300; -static const char* pszSubVer = ".2"; +static const int VERSION = 301; +static const char* pszSubVer = ".0";
--- a/util.cpp +++ b/util.cpp @@ -604,7 +604,8 @@ static char pszCachedDir[MAX_PATH]; if (pszCachedDir[0] == 0) { - strlcpy(pszCachedDir, wxStandardPaths::Get().GetUserDataDir().c_str(), sizeof(pszCachedDir)); + //strlcpy(pszCachedDir, wxStandardPaths::Get().GetUserDataDir().c_str(), sizeof(pszCachedDir)); + strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir)); _mkdir(pszCachedDir); } strlcpy(pszDir, pszCachedDir, MAX_PATH);