summaryrefslogtreecommitdiff
path: root/src/item.cc
diff options
context:
space:
mode:
authorJohann Klähn <kljohann@gmail.com>2013-01-17 12:18:58 +0100
committerJohann Klähn <kljohann@gmail.com>2013-01-17 12:19:23 +0100
commit3fe2ef59566ef679d9de58e5f9454b7443d9153a (patch)
tree3690c573e3c02dad77874a3e76c32344f5eb0be6 /src/item.cc
parentea249423d4ba00236c456080fade92f49d0622af (diff)
downloadfork-ledger-3fe2ef59566ef679d9de58e5f9454b7443d9153a.tar.gz
fork-ledger-3fe2ef59566ef679d9de58e5f9454b7443d9153a.tar.bz2
fork-ledger-3fe2ef59566ef679d9de58e5f9454b7443d9153a.zip
change handling of standard input
For `-f /dev/stdin`, the `pathname` of the parsing context will be empty as for any other streamed input. `instance_t::include_directive` did not work as expected for `-f /dev/stdin` and relative file names. One would expect them to be relative to the current directory rather than `/dev`. This will lead to `While parsing file ""` messages. This could be adjusted to read `While parsing standard input`, but maybe it's not worth the special cases. This commit also fixes bug 788: behaviour of source_context for '-f -'
Diffstat (limited to 'src/item.cc')
-rw-r--r--src/item.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item.cc b/src/item.cc
index 362fac7f..4e2a487c 100644
--- a/src/item.cc
+++ b/src/item.cc
@@ -582,8 +582,8 @@ string item_context(const item_t& item, const string& desc)
std::ostringstream out;
- if (item.pos->pathname == path("/dev/stdin")) {
- out << desc << _(" from standard input:");
+ if (item.pos->pathname.empty()) {
+ out << desc << _(" from streamed input:");
return out.str();
}