From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 1 Jun 2021 14:39:36 +0000 (+0100)
Subject: otter cli: Shut down CookedStdout before proxying responses
X-Git-Tag: otter-0.7.0~142
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d8e4dd46f37ba99320d4a18c1e99d8bade4e974;p=otter.git

otter cli: Shut down CookedStdout before proxying responses

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index f8310d9c..3a9147df 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -1932,7 +1932,7 @@ mod mgmtchannel_proxy {
   }
 
   #[throws(AE)]
-  fn call(SCCA{ ma, args,.. }:SCCA) {
+  fn call(SCCA{ out, ma, args,.. }:SCCA) {
     let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
     let mut chan = connect_chan(&ma)?;
 
@@ -1945,6 +1945,8 @@ mod mgmtchannel_proxy {
     let mut read = read.into_stream()?;
     let mut write = write.into_stream()?;
 
+    drop(out); // do our own stdout
+
     let tcmds = thread::spawn(move || {
       io_copy_interactive(&mut BufReader::new(io::stdin()), &mut write)
         .map_err(|e| match e {