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

Fix parsing of metadata values containing spaces

Browse source
This commit is contained in:
John Wiegley 2012-03-07 05:16:05 -06:00
parent 150ca971ad
commit c19b7099b2
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/item.cc
View file

@ -172,19 +172,7 @@ void item_t::parse_tags(const char * p,
q = std::strtok(NULL, " \t")) { q = std::strtok(NULL, " \t")) {
const string::size_type len = std::strlen(q); const string::size_type len = std::strlen(q);
if (len < 2) continue; if (len < 2) continue;
if (! tag.empty()) { if (q[0] == ':' && q[len - 1] == ':') { // a series of tags
string_map::iterator i;
string field(p + (q - buf.get()));
if (by_value) {
bind_scope_t bound_scope(scope, *this);
i = set_tag(tag, expr_t(field).calc(bound_scope), overwrite_existing);
} else {
i = set_tag(tag, string_value(field), overwrite_existing);
}
(*i).second.second = true;
break;
}
else if (q[0] == ':' && q[len - 1] == ':') { // a series of tags
for (char * r = std::strtok(q + 1, ":"); for (char * r = std::strtok(q + 1, ":");
r; r;
r = std::strtok(NULL, ":")) { r = std::strtok(NULL, ":")) {
@ -199,6 +187,24 @@ void item_t::parse_tags(const char * p,
index = 2; index = 2;
} }
tag = string(q, len - index); tag = string(q, len - index);
string_map::iterator i;
const string::size_type plen = std::strlen(p);
const char * v = p + (q - p) + (len - index) + 1;
while (*v == '\0' && v < p + plen)
++v;
if (v < p + plen) {
string field(v);
if (by_value) {
bind_scope_t bound_scope(scope, *this);
i = set_tag(tag, expr_t(field).calc(bound_scope), overwrite_existing);
} else {
i = set_tag(tag, string_value(field), overwrite_existing);
}
(*i).second.second = true;
break;
}
} }
first = false; first = false;
} }