From d1a8d31b45088cf96d31b86ee2e7db14d9279e02 Mon Sep 17 00:00:00 2001
From: Derek Stevens <nilix@nilfm.cc>
Date: Tue, 18 Jan 2022 16:29:16 -0700
Subject: [PATCH] key.c: fix zombie terminal processes

---
 key.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/key.c b/key.c
index 42d98b4..8de96d7 100644
--- a/key.c
+++ b/key.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <sys/wait.h>
 #include <X11/X.h>
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
@@ -782,22 +783,28 @@ void keypress(XKeyEvent* e) {
   else if (e->keycode == slcode && (e->state & SHORTCUTMOD) == (MODBITS)) {
     kbLaunch = 1;
     if (fork() == 0) {
-      close(ConnectionNumber(dpy));
-      if (dpy != '\0')
-        putenv(dpy);
-      signal(SIGINT, SIG_DFL);
-      signal(SIGTERM, SIG_DFL);
-      signal(SIGHUP, SIG_DFL);
-      if (termprog != NULL) {
-        execl(shell, shell, "-c", termprog, (char*)0);
-        fprintf(stderr, "ryudo: exec %s", shell);
-        perror(" failed");
+      if (fork() == 0) {
+        // this code doesn't seem necessary
+        // close(ConnectionNumber(dpy));
+        //  if (dpy != '\0')
+        //  putenv(dpy);
+        signal(SIGINT, SIG_DFL);
+        signal(SIGTERM, SIG_DFL);
+        signal(SIGHUP, SIG_DFL);
+        if (termprog != NULL) {
+          execl(shell, shell, "-c", termprog, (char*)0);
+          fprintf(stderr, "ryudo: exec %s", shell);
+          perror(" failed");
+        }
+        execlp("urxvt", "urxvt", (char*)0);
+        execlp("9term", "9term", scrolling ? "-ws" : "-w", (char*)0);
+        execlp("xterm", "xterm", "-ut", (char*)0);
+        perror("ryudo: exec urxvt/9term/xterm failed");
+        exit(1);
       }
-      execlp("urxvt", "urxvt", (char*)0);
-      execlp("9term", "9term", scrolling ? "-ws" : "-w", (char*)0);
-      execlp("xterm", "xterm", "-ut", (char*)0);
-      perror("ryudo: exec urxvt/9term/xterm failed");
+      exit(0);
     }
+    wait((int*)0);
   }
 #endif