Revert "fishdescriptor: try parse_eval_via_print"

[chiark-utils.git] / fishdescriptor / py / fishdescriptor / indonor.py

diff --git a/fishdescriptor/py/fishdescriptor/indonor.py b/fishdescriptor/py/fishdescriptor/indonor.py
index 12f8c685e01cf4651f5b53bd163acce4f9bfe2d1..f01f9eb0c6e910de98ee65c8c654de3f8d091325 100644 (file)
--- a/fishdescriptor/py/fishdescriptor/indonor.py
+++ b/fishdescriptor/py/fishdescriptor/indonor.py
@@ -5,10 +5,17 @@ import gdb
 import copy
 import os
 import sys
+import socket
+
+def _string_bytearray(s):
+    # gets us bytes in py2 and py3
+    if not isinstance(s, bytes):
+        s = s.encode('utf-8') # sigh, python 2/3 compat
+    return bytearray(s)
 
 def _string_escape_for_c(s):
     out = ''
-    for c in bytearray(s): # gets us bytes in py2 and py3
+    for c in _string_bytearray(s):
         if c == ord('\\') or c == ord('"') or c < 32 or c > 126:
             out += '\\x%02x' % c
         else:
@@ -24,19 +31,17 @@ def _lit_aggregate_uncasted(val_lit_strs):
     return '{' + ', '.join(['(%s)' % v for v in val_lit_strs]) + ' }'
 
 def _lit_string_uncasted(s):
-    if not isinstance(s, bytes):
-        s = s.encode('utf-8') # sigh, python 2/3 compat
-        b = bytearray(s)
-    return _lit_aggregate_uncasted(map(_lit_integer, b) + [ '0' ])
+    b = _string_bytearray(s)
+    return _lit_aggregate_uncasted([_lit_integer(x) for x in b] + [ '0' ])
 
 def _lit_array(elemtype, val_lit_strs):
     return (
         '((%s[%d])%s)' %
-        (elem_type, len(val_lit_strs), _lit_aggregate_uncasted(val_lit_strs))
+        (elemtype, len(val_lit_strs), _lit_aggregate_uncasted(val_lit_strs))
     )
 
 def _lit_addressof(v):
-    return '&(%s)' % v
+    return '&(char[])(%s)' % v
 
 def _make_lit(v):
     if isinstance(v, int):
@@ -53,15 +58,18 @@ def parse_eval(expr):
 
 class DonorStructLayout():
     def __init__(l, typename):
-        x = parse_eval('(%s){ }' % typename)
+        x = gdb.lookup_type(typename)
         l._typename = typename
         l._template = [ ]
         l._posns = { }
-        for f in x.type.fields():
+        for f in x.fields():
             l._posns[f.name] = len(l._template)
-            try: f.type.fields(); blank = '{ }'
+            try: f.type.fields();  blank = '{ }'
+            except TypeError:      blank = '0'
             except AttributeError: blank = '0'
             l._template.append(blank)
+        sys.stderr.write('##  STRUCT %s template %s fields %s\n'
+                         % (typename, l._template, l._posns))
 
     def substitute(l, values):
         build = copy.deepcopy(l._template)
@@ -77,15 +85,15 @@ class DonorImplementation():
 
     # assembling structs
     # sigh, we have to record the order of the arguments!
-    def _find_fields(typename):
+    def _find_fields(di, typename):
         try:
             fields = di._structs[typename]
-        except AttributeError:
+        except KeyError:
             fields = DonorStructLayout(typename)
             di._structs[typename] = fields
         return fields
 
-    def _make(typename, values):
+    def _make(di, typename, values):
         fields = di._find_fields(typename)
         return fields.substitute(values)
 
@@ -107,10 +115,10 @@ class DonorImplementation():
     # wrappers for the syscalls that do what we want
 
     def _sendmsg(di, carrier, control_msg):
-        iov_base = _lit_array('int', map(str,fds))
+        iov_base = _lit_array('char', [1])
         iov = di._make('struct iovec', {
             'iov_base': iov_base,
-            'iov_len' : len(fds),
+            'iov_len' : 1,
         })
 
         msg = di._make('struct msghdr', {
@@ -121,7 +129,7 @@ class DonorImplementation():
         })
 
         di._must_func(
-            'ssize_t (*)(int, const struct msghdr*, int flags)',
+            'ssize_t (*)(int, const struct msghdr*, int)',
             'sendmsg',
             '(%s, %s, 0)' % (carrier, _lit_addressof(msg))
         )
@@ -219,7 +227,9 @@ class DonorImplementation():
         di._result('%d\n' % val)
 
     def _protocol_read(di):
-        input = sys.stdin.readline().rstrip('\n')
+        input = sys.stdin.readline()
+        if input == '': return None
+        input = input.rstrip('\n')
         sys.stderr.write("#< %s\n" % input)
         return input
 
@@ -227,4 +237,5 @@ class DonorImplementation():
         while True:
             di._result('!\n')
             cmd = di._protocol_read()
+            if cmd is None: break
             eval(cmd)