From 4f4976500ac5172f9a8c7ff99b4cec1ba3484b8f Mon Sep 17 00:00:00 2001
From: Utkarsh Verma <utkarshverma@protonmail.com>
Date: Tue, 18 Jan 2022 23:58:48 +0530
Subject: [PATCH] Refactor code

---
 main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 0737998..a41e847 100644
--- a/main.c
+++ b/main.c
@@ -46,7 +46,7 @@ static int pipes[LEN(blocks)][2];
 static int timerPipe[2];
 static int signalFD;
 static int epollFD;
-static unsigned int execLock = 0;
+static int execLock = 0;
 void (*writeStatus)();
 
 int gcd(int a, int b) {
@@ -74,10 +74,12 @@ void execBlock(int i, const char* button) {
 	if (fork() == 0) {
 		close(pipes[i][0]);
 		dup2(pipes[i][1], STDOUT_FILENO);
+		close(pipes[i][1]);
 
 		if (button)
 			setenv("BLOCK_BUTTON", button, 1);
 		execl("/bin/sh", "sh", "-c", blocks[i].command, (char*)NULL);
+		_exit(1);
 	}
 }
 
@@ -213,7 +215,7 @@ void statusLoop() {
 	while (statusContinue) {
 		int eventCount = epoll_wait(epollFD, events, LEN(events), -1);
 		for (int i = 0; i < eventCount; i++) {
-			unsigned int id = events[i].data.u32;
+			unsigned short int id = events[i].data.u32;
 
 			if (id == LEN(blocks)) {
 				unsigned int j = 0;
@@ -259,6 +261,7 @@ void timerLoop() {
 	}
 
 	close(timerPipe[1]);
+	_exit(0);
 }
 
 void init() {