[master] a1929ff Not that ioctl, the other ioctl...

Poul-Henning Kamp phk at FreeBSD.org
Mon Jan 29 09:13:08 UTC 2018


commit a1929ff4a677f08c2e5fa0bcd94144fd8e44484a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 29 09:12:37 2018 +0000

    Not that ioctl, the other ioctl...

diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index bad1480..c2e9c9a 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -430,8 +430,10 @@ process_start(struct process *p)
 			vtc_log(p->vl, 4, "PUSH ptem: %s", strerror(errno));
 		if (ioctl(slave, I_PUSH, "ldterm"))
 			vtc_log(p->vl, 4, "PUSH ldterm: %s", strerror(errno));
-#endif
+		(void)ioctl(STDIN_FILENO, TIOCSCTTY, NULL);
+#else
 		AZ(ioctl(STDIN_FILENO, TIOCSCTTY, NULL));
+#endif
 		AZ(close(STDOUT_FILENO));
 		assert(dup2(slave, STDOUT_FILENO) == STDOUT_FILENO);
 		VSUB_closefrom(STDERR_FILENO + 1);


More information about the varnish-commit mailing list