From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 24 Oct 2017 15:38:40 +0000 (+0100)
Subject: fishdescriptor: wip utility, bugfixes
X-Git-Tag: archive/debian/6.0.0~1^2~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=7e2d804d6ca8b9f9f09ba67f3d963b526e8b6d37;p=chiark-utils.git

fishdescriptor: wip utility, bugfixes

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

diff --git a/fishdescriptor/fishdescriptor b/fishdescriptor/fishdescriptor
index 8bcb467..34d91e6 100755
--- a/fishdescriptor/fishdescriptor
+++ b/fishdescriptor/fishdescriptor
@@ -138,22 +138,24 @@ def process_args():
                   callback=ocb_set_donor)
 
     args = sys.argv[1:]
-    last_nominal = None
+    last_nominal = None # None or (nominal,) ie None or (None,) or (int,)
 
     while True:
         (ov, args) = op.parse_args(args=args, values=ov)
         if not len(args): break
 
         arg = args.pop(0)
+        print("ARG %s" % arg, file=sys.stderr)
 
-        if donor is not None:
+        if donor is None:
+            print("SET_DONOR", file=sys.stderr)
             set_donor(int(arg))
         elif arg_matches(r'^(?:(\d+)=)?(\d+)?$'):
             (nominal, there) = m.groups()
             nominal = None if nominal is None else int(nominal)
             there = int(there)
             pending.append((nominal,there))
-            last_nominal = nominal
+            last_nominal = (nominal,)
         elif arg == 'exec':
             if not len(args):
                 op.error("exec needs command to run")
@@ -163,7 +165,7 @@ def process_args():
             if last_nominal is None:
                 op.error('sockinfo needs a prior fd spec')
             implement_pending()
-            implement_sockinfo(last_nominal)
+            implement_sockinfo(last_nominal[0])
         else:
             op.error("unknown argument/option `%s'" % arg)