[master] 2ec9691 Integrate Geoff's Solaris patches from #2537

Poul-Henning Kamp phk at FreeBSD.org
Thu Jan 11 21:55:07 UTC 2018


commit 2ec9691b86dbf37c1148d323f9fefced48eeba09
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jan 11 21:53:00 2018 +0000

    Integrate Geoff's Solaris patches from #2537
    
    I owe the next round Geoff.

diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index d7b94e6..b8573b7 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -38,6 +38,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef _sun
+#include <stropts.h>
+#endif
 #include <termios.h>
 #include <unistd.h>
 
@@ -334,7 +337,6 @@ process_init_term(struct process *p, int fd)
 	tt.c_cc[VKILL] = '\x15';		// CTRL-U
 	tt.c_cc[VINTR] = '\x03';		// CTRL-C
 	tt.c_cc[VQUIT] = '\x1c';		// CTRL-backslash
-	tt.c_cc[VMIN] = 1;
 
 	i = tcsetattr(fd, TCSAFLUSH, &tt);
 	if (i)
@@ -366,6 +368,12 @@ process_start(struct process *p)
 	AN(slavename);
 	slave = open(slavename, O_RDWR);
 	assert(slave >= 0);
+#ifdef __sun
+	if (ioctl(slave, I_PUSH, "ptem"))
+		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
 
 	process_init_term(p, slave);
 


More information about the varnish-commit mailing list