From 5fa61e5a54a2c1e908a9f460bf1fb9e84e9e98c2 Mon Sep 17 00:00:00 2001 From: CcydtN Date: Thu, 16 Jun 2022 01:06:51 +0800 Subject: Fix generating zombie process --- src/managers/KeybindManager.cpp | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'src/managers/KeybindManager.cpp') diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index be87e24a..c60d22a0 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -141,11 +141,48 @@ void CKeybindManager::spawn(std::string args) { args = "WAYLAND_DISPLAY=" + std::string(g_pCompositor->m_szWLDisplaySocket) + " " + args; Debug::log(LOG, "Executing %s", args.c_str()); - if (fork() == 0) { - execl("/bin/sh", "/bin/sh", "-c", args.c_str(), nullptr); + int socket[2]; + if (pipe(socket) != 0) { + Debug::log(LOG, "Unable to create pipe for fork"); + } + + pid_t child ,grandchild; + child = fork(); + if (child<0){ + close(socket[0]); + close(socket[1]); + Debug::log(LOG, "Fail to create the first fork"); + return; + } + if (child == 0){ + // run in child + grandchild = fork(); + if (grandchild==0){ + // run in grandchild + close(socket[0]); + close(socket[1]); + execl("/bin/sh", "/bin/sh", "-c", args.c_str(), nullptr); + // exit grandchild + _exit(0); + } + close(socket[0]); + (void) write(socket[1], &grandchild, sizeof(grandchild)); + close(socket[1]); + // exit child _exit(0); } + // run in parent + close(socket[1]); + (void) read(socket[0], &grandchild,sizeof(grandchild)); + close(socket[0]); + // clear child and leave child to init + waitpid(child, NULL, 0); + if (child<0){ + Debug::log(LOG, "Fail to create the second fork"); + return; + } + Debug::log(LOG, "Process Created with pid %d",grandchild); } void CKeybindManager::killActive(std::string args) { -- cgit v1.2.3