From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 15 Aug 2022 16:07:27 +0000 (+0100)
Subject: prefork-interp: Move call to call_sock_from_fd (nfc)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=14c464bf28620340070bb38701a26bc64a11455e;p=chiark-utils.git

prefork-interp: Move call to call_sock_from_fd (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/cprogs/prefork-interp.c b/cprogs/prefork-interp.c
index 3ebcf01..8e4b03c 100644
--- a/cprogs/prefork-interp.c
+++ b/cprogs/prefork-interp.c
@@ -386,6 +386,8 @@ static FILE *connect_or_spawn(void) {
   close(fake_pair[1]);
   close(sfd);
 
+  call_sock = call_sock_from_fd(fake_pair[0]);
+
   int status;
   pid_t got = waitpid(setup_pid, &status, 0);
   if (got == (pid_t)-1) diee("waitpid setup [%ld]", (long)setup_pid);
@@ -394,7 +396,7 @@ static FILE *connect_or_spawn(void) {
   if (status != 0) propagate_exit_status(status, "setup");
 
   close(lockfd);
-  return call_sock_from_fd(fake_pair[0]);
+  return call_sock;
 }
 
 static void make_executor_argv(const char *const *argv) {