From bf7a483f87b8de0a6a12115515da47aec601a543 Mon Sep 17 00:00:00 2001
From: Mattias Wadman <mattias.wadman@gmail.com>
Date: Sun, 23 Jan 2022 12:35:19 +0100
Subject: [PATCH] interp: Fix handling of group decode error from stdin

null input to open means stdin but it as also erroneously also used as object key
to store the error.
---
 pkg/interp/interp.jq              | 9 +++++----
 pkg/interp/testdata/inputs.fqtest | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkg/interp/interp.jq b/pkg/interp/interp.jq
index 7e9fa58a..04fd06f9 100644
--- a/pkg/interp/interp.jq
+++ b/pkg/interp/interp.jq
@@ -47,16 +47,17 @@ def input:
     | [.[0], .[1:]] as [$h, $t]
     | _input_filenames($t)
     | _input_filename(null) as $_
+    | ($h // "<stdin>") as $name
     | $h
     | try
         # null input here means stdin
         ( open
-        | _input_filename($h // "<stdin>") as $_
+        | _input_filename($name) as $_
         | .
         )
       catch
         ( . as $err
-        | _input_io_errors(. += {($h): $err}) as $_
+        | _input_io_errors(. += {($name): $err}) as $_
         | $err
         | (_error_str | printerrln)
         , _input($opts; f)
@@ -64,8 +65,8 @@ def input:
     | try f
       catch
         ( . as $err
-        | _input_decode_errors(. += {($h): $err}) as $_
-        | [ "\($h): \($opts.decode_format)"
+        | _input_decode_errors(. += {($name): $err}) as $_
+        | [ "\($name): \($opts.decode_format)"
           , if $err | type == "string" then ": \($err)"
             # TODO: if not string assume decode itself failed for now
             else ": failed to decode (try -d FORMAT)"
diff --git a/pkg/interp/testdata/inputs.fqtest b/pkg/interp/testdata/inputs.fqtest
index ccdf2de4..8c95f37d 100644
--- a/pkg/interp/testdata/inputs.fqtest
+++ b/pkg/interp/testdata/inputs.fqtest
@@ -93,3 +93,9 @@ $ fq -i -s -d raw . /a /b /c
 "raw"
 "raw"
 [raw, ...][0:3]> ^D
+$ fq
+exitcode: 4
+stdin:
+test
+stderr:
+error: <stdin>: probe: failed to decode (try -d FORMAT)