From bc714f8001edbb26ebf07411cf92e9ba2f756b35 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 26 Oct 2020 21:31:16 +0000 Subject: Refactor textmessage/textclient with channel creation around ancil_* --- src/libunixonacid/textclient_startf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/libunixonacid/textclient_startf.c') diff --git a/src/libunixonacid/textclient_startf.c b/src/libunixonacid/textclient_startf.c index 20ebe33..fc871fd 100644 --- a/src/libunixonacid/textclient_startf.c +++ b/src/libunixonacid/textclient_startf.c @@ -21,10 +21,11 @@ int textclient_startf (textclient_t *a, char const *const *argv, char const *con textmessage_sender_init(&a->syncout, fd[1]) ; a->pid = pid ; a->options = options ; - if (!textclient_exchange(a, before, beforelen, &v, deadline, stamp)) goto err ; - if (v.iov_len != afterlen || memcmp(v.iov_base, after, afterlen)) goto errproto ; + if (!textclient_timed_send(a, before, beforelen, deadline, stamp)) goto err ; if (sanitize_read(textmessage_timed_receive(&a->asyncin, &v, deadline, stamp)) <= 0) goto err ; if (v.iov_len != afterlen || memcmp(v.iov_base, after, afterlen)) goto errproto ; + if (!textclient_timed_get(a, &v, deadline, stamp)) goto err ; + if (v.iov_len != afterlen || memcmp(v.iov_base, after, afterlen)) goto errproto ; return 1 ; errproto: -- cgit v1.3.1