Merge remote-tracking branch 'upstream/master'

2 files changed, 21 insertions, 7 deletions

diff --git a/src/libdraw/getsubfont.c b/src/libdraw/getsubfont.c
index ec4ccfe3..1cc234ef 100644
--- a/src/libdraw/getsubfont.c
+++ b/src/libdraw/getsubfont.c
@@ -53,15 +53,25 @@ _getsubfont(Display *d, char *name)
 static int
 defaultpipe(void)
 {
-	int p[2];
+	int p[2], pid;
 
-	// assuming defontdata (<5k) fits in pipe buffer.
-	// especially reasonable since p9pipe is actually
-	// a socket pair.
+	// Used to assume that defontdata (<5k) fit in the
+	// pipe buffer, especially since p9pipe is actually
+	// a socket pair. But OpenBSD in particular saw hangs,
+	// so feed the pipe it the "right" way with a subprocess.
 	if(pipe(p) < 0)
 		return -1;
-	write(p[1], defontdata, sizeof defontdata);
-	close(p[1]);
+	if((pid = fork()) < 0) {
+		close(p[0]);
+		close(p[1]);
+		return -1;
+	}
+	if(pid == 0) {
+		close(p[0]);
+		write(p[1], defontdata, sizeof defontdata);
+		close(p[1]);
+		_exit(0);
+	}
 	return p[0];
 }
 
diff --git a/src/libdraw/mouse.c b/src/libdraw/mouse.c
index 64a7f73d..382efae5 100644
--- a/src/libdraw/mouse.c
+++ b/src/libdraw/mouse.c
@@ -52,8 +52,12 @@ _ioproc(void *arg)
 	one = 1;
 	resized = 0;
 	for(;;){
-		if(_displayrdmouse(mc->display, &m, &resized) < 0)
+		if(_displayrdmouse(mc->display, &m, &resized) < 0) {
+			if(postnote(PNPROC, getpid(), "hangup") < 0)
+				fprint(2, "postnote: %r\n");
+			sleep(10*1000);
 			threadexitsall("mouse read error");
+		}
 		if(resized)
 			send(mc->resizec, &one);
 		send(mc->c, &m);