From 4b261f99bc56853b3468a8a1bb5b4af39ed67af5 Mon Sep 17 00:00:00 2001 From: Craig Earls Date: Thu, 25 Oct 2012 10:39:48 -0700 Subject: Fixes Bug 695, ledger ignores --init-file Handle --init-file as a special command option like the debug options. That wway we can have the argument captured before teh global scope is created. --- src/global.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/global.cc') diff --git a/src/global.cc b/src/global.cc index a718d6cb..3e83ba04 100644 --- a/src/global.cc +++ b/src/global.cc @@ -44,6 +44,7 @@ namespace ledger { static bool args_only = false; +std::string _init_file; global_scope_t::global_scope_t(char ** envp) { @@ -126,6 +127,8 @@ void global_scope_t::read_init() } TRACE_FINISH(init, 1); + } else { + throw_(parse_error, _f("Could not find specified init file %1%") % init_file); } } } @@ -473,6 +476,10 @@ void handle_debug_options(int argc, char * argv[]) _log_level = LOG_INFO; #endif } + else if (i + 1 < argc && std::strcmp(argv[i], "--init-file") == 0) { + _init_file = argv[i + 1]; + i++; + } else if (i + 1 < argc && std::strcmp(argv[i], "--debug") == 0) { #if DEBUG_ON _log_level = LOG_DEBUG; -- cgit v1.2.3