sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't give an error if the init file cannot be found.

Browse source
This commit is contained in:
John Wiegley 2009-02-05 02:16:43 -04:00
parent 3f960be96c
commit db52ad86d5
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/session.cc
View file

@ -172,24 +172,20 @@ std::size_t session_t::read_journal(journal_t& journal,
void session_t::read_init()
{
if (! init_file)
return;
if (init_file && exists(*init_file)) {
TRACE_START(init, 1, "Read initialization file");
if (! exists(*init_file))
throw_(std::logic_error, "Cannot read init file" << *init_file);
ifstream init(*init_file);
TRACE_START(init, 1, "Read initialization file");
journal_t temp;
if (read_journal(temp, *init_file) > 0 ||
temp.auto_entries.size() > 0 || temp.period_entries.size() > 0) {
throw_(parse_error,
"Entries found in initialization file '" << init_file << "'");
}
ifstream init(*init_file);
journal_t temp;
if (read_journal(temp, *init_file) > 0 ||
temp.auto_entries.size() > 0 || temp.period_entries.size() > 0) {
throw_(parse_error,
"Entries found in initialization file '" << init_file << "'");
TRACE_FINISH(init, 1);
}
TRACE_FINISH(init, 1);
}
std::size_t session_t::read_data(journal_t& journal,