Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc

[misc] / hush.in

diff --git a/hush.in b/hush.in
index 435952706e174f93b900a21e2206ef4a7a1f6150..d5aebcb2d40bd7a5d77ae3420c127deb49e0a5b3 100755 (executable)
--- a/hush.in
+++ b/hush.in
@@ -145,10 +145,11 @@ EOF
 ## stage of a pipeline, where we actually wanted the status of the first.  So
 ## we write that to another pipe (fd 5) and pick it out using command
 ## substitution.
+copy () { while IFS= read -r line; do printf "%s %s\n" "$1" "$line"; done; }
 rc=$(
   { { { { set +e; $lbuf "$cmd" "$@" 3>&- 4>&- 5>&-; echo $? >&5; } |
-       while IFS= read line; do echo "| $line"; done >&4; } 2>&1 |
-      while IFS= read line; do echo "* $line"; done >&4; } 4>&1 |
+       copy "|" >&4; } 2>&1 |
+      copy "*" >&4; } 4>&1 |
     cat -u >&3; } 5>&1 </dev/null
 )