diff options
author | Craig Earls <enderw88@gmail.com> | 2012-10-25 10:39:48 -0700 |
---|---|---|
committer | Craig Earls <enderw88@gmail.com> | 2012-10-25 10:39:48 -0700 |
commit | 4b261f99bc56853b3468a8a1bb5b4af39ed67af5 (patch) | |
tree | 87b067d8aa94f651eda9b584e6762dc3ae2c3fe0 /src/global.cc | |
parent | 41cc9a7f3cb9cd4b1857b0209c59ef66929edf03 (diff) | |
download | fork-ledger-4b261f99bc56853b3468a8a1bb5b4af39ed67af5.tar.gz fork-ledger-4b261f99bc56853b3468a8a1bb5b4af39ed67af5.tar.bz2 fork-ledger-4b261f99bc56853b3468a8a1bb5b4af39ed67af5.zip |
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.
Diffstat (limited to 'src/global.cc')
-rw-r--r-- | src/global.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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; |