fix -datadir=./subdir relative path,

autostart off by default except on windows,
fix occasional "vector iterator not dereferencable" assertion with msvc,
fix readlink compile warning on linux build,
use sys/param.h and BSD define instead of __BSD__,
-paytxfee switch

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@130 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 14 insertions, 2 deletions

diff --git a/init.cpp b/init.cpp
index 0eacebc305..b99237ec66 100644
--- a/init.cpp
+++ b/init.cpp
@@ -137,7 +137,10 @@ bool AppInit2(int argc, char* argv[])
     ParseParameters(argc, argv);

 

     if (mapArgs.count("-datadir"))

-        strlcpy(pszSetDataDir, mapArgs["-datadir"].c_str(), sizeof(pszSetDataDir));

+    {

+        filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]);

+        strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));

+    }

 

     ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir

 

@@ -363,6 +366,15 @@ bool AppInit2(int argc, char* argv[])
         }

     }

 

+    if (mapArgs.count("-paytxfee"))

+    {

+        if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))

+        {

+            wxMessageBox(_("Invalid amount for -paytxfee=<amount>"), "Bitcoin");

+            return false;

+        }

+    }

+

     //

     // Create the main window and start the node

     //

@@ -382,7 +394,7 @@ bool AppInit2(int argc, char* argv[])
     if (mapArgs.count("-server") || fDaemon)

         CreateThread(ThreadRPCServer, NULL);

 

-#ifdef GUI

+#if defined(__WXMSW__) && defined(GUI)

     if (fFirstRun)

         SetStartOnSystemStartup(true);

 #endif