chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7215e9
)
prefork-interp: Move call to call_sock_from_fd (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 15 Aug 2022 16:07:27 +0000
(17:07 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 21 Aug 2022 20:21:10 +0000
(21:21 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
cprogs/prefork-interp.c
patch
|
blob
|
history
diff --git
a/cprogs/prefork-interp.c
b/cprogs/prefork-interp.c
index 3ebcf019ccca2c7a84233baa51f75a7d0e770827..8e4b03cec19ffe9be2762682278c0b0167a5c8c8 100644
(file)
--- 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) {