fish: remote: Output from close event now passed over stdout (RHBZ#802389).

1 files changed, 9 insertions, 0 deletions

diff --git a/fish/rc.c b/fish/rc.c
index aa12820a..4c119f7b 100644
--- a/fish/rc.c
+++ b/fish/rc.c
@@ -291,6 +291,15 @@ rc_listen (void)
 
         xdr_free ((xdrproc_t) xdr_guestfish_call, (char *) &call);
 
+        /* RHBZ#802389: If the command is quit, close the handle right
+         * away.  Note that the main while loop will exit preventing
+         * 'g' from being reused.
+         */
+        if (quit) {
+          guestfs_close (g);
+          g = NULL;
+        }
+
         /* Send the reply. */
         xdrstdio_create (&xdr2, fp, XDR_ENCODE);
         (void) xdr_guestfish_reply (&xdr2, &reply);