X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=fishdescriptor%2Ffishdescriptor;h=8955b462aae647e42dca30e1d65ece76069260fe;hb=refs%2Fheads%2Fmaster;hp=d4c745a37d6aef57db842c4e77c2915322d6183e;hpb=ce86dddf6ab90c5dc5d8afebf2df123333cf8aed;p=chiark-utils.git

diff --git a/fishdescriptor/fishdescriptor b/fishdescriptor/fishdescriptor
index d4c745a..8955b46 100755
--- a/fishdescriptor/fishdescriptor
+++ b/fishdescriptor/fishdescriptor
@@ -1,5 +1,24 @@
 #!/usr/bin/python3
 
+# This file is part of chiark-utils, a collection of useful programs
+# used on chiark.greenend.org.uk.
+#
+# This file is:
+#  Copyright 2018 Citrix Systems Ltd
+#
+# This is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
+
 import sys
 import fishdescriptor.fish
 import optparse
@@ -43,7 +62,7 @@ def implement_pending():
     for (nominal, there), actual in zip(pending, actuals):
         overwriting_info = fdmap.get(nominal)
         if overwriting_info is not None: os.close(overwriting_info[0])
-        fdmap[nominal] = (actual, donor, there)
+        fdmap[nominal] = [actual, donor, there]
 
 def implement_sockinfo(nominal):
     (actual, tdonor, there) = fdmap[nominal]
@@ -107,9 +126,10 @@ def permute_fds_for_exec():
             if inway_intended is not None:
                 inway_moved = os.dup(intended)
                 actual2intended[inway_moved] = inway_intended
-                fdmap[inway_intented][0] = inway_moved
+                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()