diff options
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 1b40a868a..c1b26812b 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -3,9 +3,17 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "init.h" + + #include "bitcoinrpc.h" +#include "init.h" +#include "main.h" +#include "noui.h" +#include "ui_interface.h" +#include "util.h" + #include <boost/algorithm/string/predicate.hpp> +#include <boost/filesystem.hpp> void DetectShutdownThread(boost::thread_group* threadGroup) { @@ -57,12 +65,13 @@ bool AppInit(int argc, char* argv[]) // First part of help message is specific to bitcoind / RPC client std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoind [options] " + "\n" + - " bitcoind [options] <command> [params] " + _("Send command to -server or bitcoind") + "\n" + + " bitcoind [options] " + _("Start Bitcoin server") + "\n" + + _("Usage (deprecated, use bitcoin-cli):") + "\n" + + " bitcoind [options] <command> [params] " + _("Send command to Bitcoin server") + "\n" + " bitcoind [options] help " + _("List commands") + "\n" + " bitcoind [options] help <command> " + _("Get help for a command") + "\n"; - strUsage += "\n" + HelpMessage(); + strUsage += "\n" + HelpMessage(HMM_BITCOIND); fprintf(stdout, "%s", strUsage.c_str()); return false; @@ -104,7 +113,7 @@ bool AppInit(int argc, char* argv[]) #endif detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup)); - fRet = AppInit2(threadGroup); + fRet = AppInit2(threadGroup, true); } catch (std::exception& e) { PrintExceptionContinue(&e, "AppInit()"); @@ -134,11 +143,9 @@ bool AppInit(int argc, char* argv[]) return fRet; } -extern void noui_connect(); int main(int argc, char* argv[]) { bool fRet = false; - fHaveGUI = false; // Connect bitcoind signal handlers noui_connect(); |