From ea249423d4ba00236c456080fade92f49d0622af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johann=20Kl=C3=A4hn?= <kljohann@gmail.com>
Date: Thu, 17 Jan 2013 12:07:21 +0100
Subject: [PATCH 1/2] allow -f /dev/stdin in test runner

---
 test/RegressTests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/RegressTests.py b/test/RegressTests.py
index 1094d0d5..01e14191 100755
--- a/test/RegressTests.py
+++ b/test/RegressTests.py
@@ -100,7 +100,7 @@ class RegressFile(object):
         use_stdin = False
         if test['command'].find("-f ") != -1:
             test['command'] = '$ledger ' + test['command']
-            if test['command'].find("-f - ") != -1:
+            if re.search("-f (-|/dev/stdin)(\s|$)", test['command']):
                 use_stdin = True
         else:
             test['command'] = (('$ledger -f "%s" ' % 

From 3fe2ef59566ef679d9de58e5f9454b7443d9153a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johann=20Kl=C3=A4hn?= <kljohann@gmail.com>
Date: Thu, 17 Jan 2013 12:18:58 +0100
Subject: [PATCH 2/2] 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 -'
---
 src/error.cc                 |  2 +-
 src/item.cc                  |  4 ++--
 src/session.cc               |  2 +-
 test/regress/BF3C1F82-2.test | 12 ++++++++++++
 test/regress/BF3C1F82.test   | 19 +++++++++++++++++++
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 test/regress/BF3C1F82-2.test
 create mode 100644 test/regress/BF3C1F82.test

diff --git a/src/error.cc b/src/error.cc
index 58339db7..8aa1d3d6 100644
--- a/src/error.cc
+++ b/src/error.cc
@@ -84,7 +84,7 @@ string source_context(const path&            file,
                       const string&          prefix)
 {
   const std::streamoff len = end_pos - pos;
-  if (! len || file == path("/dev/stdin"))
+  if (! len || file.empty())
     return _("<no source context>");
 
   assert(len > 0);
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();
   }
 
diff --git a/src/session.cc b/src/session.cc
index b6153203..f047a540 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -143,7 +143,7 @@ std::size_t session_t::read_data(const string& master_account)
     }
 
     foreach (const path& pathname, HANDLER(file_).data_files) {
-      if (pathname == "-") {
+      if (pathname == "-" || pathname == "/dev/stdin") {
         // To avoid problems with stdin and pipes, etc., we read the entire
         // file in beforehand into a memory buffer, and then parcel it out
         // from there.
diff --git a/test/regress/BF3C1F82-2.test b/test/regress/BF3C1F82-2.test
new file mode 100644
index 00000000..453151ce
--- /dev/null
+++ b/test/regress/BF3C1F82-2.test
@@ -0,0 +1,12 @@
+; Check that include directives are relative for "-f /dev/stdin"
+include non-existent-ledger-file-BF3C1F82
+test -f - reg -> 1
+__ERROR__
+While parsing file "", line 2: 
+Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+end test
+test -f /dev/stdin reg -> 1
+__ERROR__
+While parsing file "", line 2: 
+Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+end test
diff --git a/test/regress/BF3C1F82.test b/test/regress/BF3C1F82.test
new file mode 100644
index 00000000..50f4106f
--- /dev/null
+++ b/test/regress/BF3C1F82.test
@@ -0,0 +1,19 @@
+; Check that error reporting works for "-f -"
+
+2012/02/30 * Test
+  a  1
+  b
+test -f - reg -> 1
+__ERROR__
+While parsing file "", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test
+test -f /dev/stdin reg -> 1
+__ERROR__
+While parsing file "", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test