From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 7 Jun 2018 16:43:42 +0000 (+0100)
Subject: fishdescriptor: Actually tidy up actual2intended when closing
X-Git-Tag: archive/debian/6.0.2_bpo9+1^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5e8630d807e1c76615db22258d06752367fd79ea;p=chiark-utils.git

fishdescriptor: Actually tidy up actual2intended when closing

Otherwise we will probably try to move the new-defunct open-file
somewhere when we try to make the descriptor refer to the intended
open-file.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/fishdescriptor/fishdescriptor b/fishdescriptor/fishdescriptor
index d583533..8955b46 100755
--- a/fishdescriptor/fishdescriptor
+++ b/fishdescriptor/fishdescriptor
@@ -129,6 +129,7 @@ def permute_fds_for_exec():
                 fdmap[inway_intended][0] = inway_moved
             os.dup2(actual, intended)
         os.close(actual)
+        del actual2intended[actual]
 
 def implement_exec(argl):
     if donor is not None: donor.detach()