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

(textual_t::parse): Don't manipulate istream_pos_type objects on the

Browse source 
stack, this seems to blow things up on at least one OpenBSD system.
This commit is contained in:
John Wiegley 2006-03-03 09:25:04 +00:00
parent d1bfacda38
commit 2c4d724bd8
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
textual.cc
View file

@ -131,7 +131,7 @@ value_expr_t * parse_amount(const char * text, amount_t& amt,
{ {
char * altbuf = NULL; char * altbuf = NULL;
if (*text && *text != '(') { if (*text && *text != '(' && *text != '-') {
bool in_quote = false; bool in_quote = false;
bool seen_digit = false; bool seen_digit = false;
for (const char * p = text + 1; *p; p++) for (const char * p = text + 1; *p; p++)
@ -309,7 +309,7 @@ bool parse_transactions(std::istream& in,
account_t * account, account_t * account,
entry_base_t& entry, entry_base_t& entry,
const std::string& kind, const std::string& kind,
istream_pos_type& beg_pos) unsigned long beg_pos)
{ {
static char line[MAX_LINE + 1]; static char line[MAX_LINE + 1];
bool added = false; bool added = false;
@ -318,7 +318,7 @@ bool parse_transactions(std::istream& in,
in.getline(line, MAX_LINE); in.getline(line, MAX_LINE);
if (in.eof()) if (in.eof())
break; break;
beg_pos += istream_pos_type(std::strlen(line) + 1); beg_pos += std::strlen(line) + 1;
linenum++; linenum++;
if (line[0] == ' ' || line[0] == '\t' || line[0] == '\r') { if (line[0] == ' ' || line[0] == '\t' || line[0] == '\r') {
char * p = skip_ws(line); char * p = skip_ws(line);
@ -342,7 +342,7 @@ namespace {
} }
entry_t * parse_entry(std::istream& in, char * line, account_t * master, entry_t * parse_entry(std::istream& in, char * line, account_t * master,
textual_parser_t& parser, istream_pos_type& beg_pos) textual_parser_t& parser, unsigned long beg_pos)
{ {
std::auto_ptr<entry_t> curr(new entry_t); std::auto_ptr<entry_t> curr(new entry_t);
@ -401,14 +401,14 @@ entry_t * parse_entry(std::istream& in, char * line, account_t * master,
TIMER_START(entry_xacts); TIMER_START(entry_xacts);
istream_pos_type end_pos; unsigned long end_pos;
unsigned long beg_line = linenum; unsigned long beg_line = linenum;
while (! in.eof() && (in.peek() == ' ' || in.peek() == '\t')) { while (! in.eof() && (in.peek() == ' ' || in.peek() == '\t')) {
line[0] = '\0'; line[0] = '\0';
in.getline(line, MAX_LINE); in.getline(line, MAX_LINE);
if (in.eof() && line[0] == '\0') if (in.eof() && line[0] == '\0')
break; break;
end_pos = beg_pos + istream_pos_type(std::strlen(line) + 1); end_pos = beg_pos + std::strlen(line) + 1;
linenum++; linenum++;
if (line[0] == ' ' || line[0] == '\t' || line[0] == '\r') { if (line[0] == ' ' || line[0] == '\t' || line[0] == '\r') {
@ -539,8 +539,8 @@ unsigned int textual_parser_t::parse(std::istream& in,
src_idx = journal->sources.size() - 1; src_idx = journal->sources.size() - 1;
linenum = 1; linenum = 1;
istream_pos_type beg_pos = in.tellg(); unsigned long beg_pos = in.tellg();
istream_pos_type end_pos; unsigned long end_pos;
unsigned long beg_line = linenum; unsigned long beg_line = linenum;
while (in.good() && ! in.eof()) { while (in.good() && ! in.eof()) {
try { try {
@ -548,7 +548,7 @@ unsigned int textual_parser_t::parse(std::istream& in,
if (in.eof()) if (in.eof())
break; break;
linenum++; linenum++;
end_pos = beg_pos + istream_pos_type(std::strlen(line) + 1); end_pos = beg_pos + std::strlen(line) + 1;
switch (line[0]) { switch (line[0]) {
case '\0': case '\0':
@ -736,8 +736,8 @@ unsigned int textual_parser_t::parse(std::istream& in,
if (word == "include") { if (word == "include") {
push_var<std::string> save_path(path); push_var<std::string> save_path(path);
push_var<unsigned int> save_src_idx(src_idx); push_var<unsigned int> save_src_idx(src_idx);
push_var<istream_pos_type> save_beg_pos(beg_pos); push_var<unsigned long> save_beg_pos(beg_pos);
push_var<istream_pos_type> save_end_pos(end_pos); push_var<unsigned long> save_end_pos(end_pos);
push_var<unsigned int> save_linenum(linenum); push_var<unsigned int> save_linenum(linenum);
path = p; path = p;
@ -786,7 +786,7 @@ unsigned int textual_parser_t::parse(std::istream& in,
default: { default: {
unsigned int first_line = linenum; unsigned int first_line = linenum;
istream_pos_type pos = end_pos; unsigned long pos = end_pos;
if (entry_t * entry = if (entry_t * entry =
parse_entry(in, line, account_stack.front(), *this, pos)) { parse_entry(in, line, account_stack.front(), *this, pos)) {
if (journal->add_entry(entry)) { if (journal->add_entry(entry)) {
@ -890,8 +890,7 @@ void write_textual_journal(journal_t& journal, std::string path,
auto_entries_list::iterator al = journal.auto_entries.begin(); auto_entries_list::iterator al = journal.auto_entries.begin();
period_entries_list::iterator pl = journal.period_entries.begin(); period_entries_list::iterator pl = journal.period_entries.begin();
istream_pos_type pos = 0; unsigned long pos = 0;
istream_pos_type jump_to;
format_t hdr_fmt(write_hdr_format); format_t hdr_fmt(write_hdr_format);
std::ifstream in(found.c_str()); std::ifstream in(found.c_str());