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

Fix Bug 1057: Emacs output does not escape special characters.

Browse source
This commit is contained in:
Craig Earls 2014-06-26 20:52:50 -07:00
parent 3a2eb94bef
commit db73e7af9e
2 changed files with 69 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
src/emacs.cc
View file

@ -30,7 +30,7 @@
*/ */
#include <system.hh> #include <system.hh>
#include <boost/algorithm/string.hpp>
#include "emacs.h" #include "emacs.h"
#include "xact.h" #include "xact.h"
#include "post.h" #include "post.h"
@ -38,78 +38,84 @@
namespace ledger { namespace ledger {
void format_emacs_posts::write_xact(xact_t& xact) void format_emacs_posts::write_xact(xact_t& xact)
{ {
if (xact.pos) if (xact.pos)
out << "\"" << xact.pos->pathname.string() << "\" " out << "\"" << xact.pos->pathname.string() << "\" "
<< xact.pos->beg_line << " "; << xact.pos->beg_line << " ";
else else
out << "\"\" " << -1 << " "; out << "\"\" " << -1 << " ";
tm when = gregorian::to_tm(xact.date()); tm when = gregorian::to_tm(xact.date());
std::time_t date = std::mktime(&when); std::time_t date = std::mktime(&when);
out << "(" << (date / 65536) << " " << (date % 65536) << " 0) "; out << "(" << (date / 65536) << " " << (date % 65536) << " 0) ";
if (xact.code) if (xact.code)
out << "\"" << *xact.code << "\" "; out << "\"" << *xact.code << "\" ";
else else
out << "nil "; out << "nil ";
if (xact.payee.empty()) if (xact.payee.empty())
out << "nil"; out << "nil";
else else
out << "\"" << xact.payee << "\""; out << "\"" << xact.payee << "\"";
out << "\n"; out << "\n";
} }
void format_emacs_posts::operator()(post_t& post) void format_emacs_posts::operator()(post_t& post)
{ {
if (! post.has_xdata() || if (! post.has_xdata() ||
! post.xdata().has_flags(POST_EXT_DISPLAYED)) { ! post.xdata().has_flags(POST_EXT_DISPLAYED)) {
if (! last_xact) { if (! last_xact) {
out << "(("; out << "((";
write_xact(*post.xact); write_xact(*post.xact);
} }
else if (post.xact != last_xact) { else if (post.xact != last_xact) {
out << ")\n ("; out << ")\n (";
write_xact(*post.xact); write_xact(*post.xact);
} }
else { else {
out << "\n"; out << "\n";
} }
if (post.pos) if (post.pos)
out << " (" << post.pos->beg_line << " "; out << " (" << post.pos->beg_line << " ";
else else
out << " (" << -1 << " "; out << " (" << -1 << " ";
out << "\"" << post.reported_account()->fullname() << "\" \"" out << "\"" << post.reported_account()->fullname() << "\" \""
<< post.amount << "\""; << post.amount << "\"";
switch (post.state()) { switch (post.state()) {
case item_t::UNCLEARED: case item_t::UNCLEARED:
out << " nil"; out << " nil";
break; break;
case item_t::CLEARED: case item_t::CLEARED:
out << " t"; out << " t";
break; break;
case item_t::PENDING: case item_t::PENDING:
out << " pending"; out << " pending";
break; break;
} }
if (post.cost) if (post.cost)
out << " \"" << *post.cost << "\""; out << " \"" << *post.cost << "\"";
if (post.note) if (post.note)
out << " \"" << *post.note << "\""; out << " \"" << escape_string(*post.note) << "\"";
out << ")"; out << ")";
last_xact = post.xact; last_xact = post.xact;
post.xdata().add_flags(POST_EXT_DISPLAYED); post.xdata().add_flags(POST_EXT_DISPLAYED);
} }
} }
string format_emacs_posts::escape_string(string raw){
replace_all(raw, "\\", "\\\\");
replace_all(raw, "\"", "\\\"");
return raw;
}
} // namespace ledger } // namespace ledger

1
src/emacs.h
View file

@ -72,6 +72,7 @@ public:
out.flush(); out.flush();
} }
virtual void operator()(post_t& post); virtual void operator()(post_t& post);
virtual string escape_string(string raw);
}; };
} // namespace ledger } // namespace ledger