From b1b05057c81ea5035739e6ee3daf183850983ff1 Mon Sep 17 00:00:00 2001
From: afonso <afonso@francof.net>
Date: Sun, 12 May 2024 14:38:25 +0100
Subject: [PATCH] Fix makefile and fifo path

---
 Makefile                              | 22 +++++++++++++---------
 src/djumbai_dequeue/djumbai_dequeue.c |  2 +-
 src/djumbai_send/djumbai_send.c       |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a241958..8274f1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Compiler
-CC := /opt/homebrew/opt/llvm/bin/clang
+CC := gcc
 # Compiler flags
 CFLAGS := -Wall -Wextra -Werror -Ilibs -fsanitize=address
 
@@ -46,21 +46,25 @@ users:
 
 
 permissions:
-	-sudo chown djumbaiq $(BINDIR)/djumbai_enqueue/djumbai_enqueue
+	-sudo chown djumbaiq:djumbai $(BINDIR)/djumbai_enqueue/djumbai_enqueue
 	-sudo chmod u+s $(BINDIR)/djumbai_enqueue/djumbai_enqueue
-	-sudo chown djumbaid $(BINDIR)/djumbai_dequeue/djumbai_dequeue
+	-sudo chown djumbaid:djumbai_queue $(BINDIR)/djumbai_dequeue/djumbai_dequeue
 	-sudo chmod u+s $(BINDIR)/djumbai_dequeue/djumbai_dequeue
-	-sudo chown root $(BINDIR)/djumbai_send/djumbai_send
+	-sudo chown root:djumbai_send $(BINDIR)/djumbai_send/djumbai_send
 	-sudo chmod u+s $(BINDIR)/djumbai_send/djumbai_send
 
 directories:
-	-sudo -u root -g djumbai mkdir /opt/djumbai
-	-sudo -u root -g djumbai mkdir /opt/djumbai/fifos
-	-sudo -u root -g djumbai mkdir /opt/djumbai/user
-	-sudo -u root -g djumbai mkdir /opt/djumbai/group
+	-sudo mkdir -m 050 /opt/djumbai
+	-sudo mkdir -m 070 /opt/djumbai/fifos
+	-sudo mkdir -m 070 /opt/djumbai/user
+	-sudo mkdir -m 070 /opt/djumbai/group
+	-sudo chown nobody:djumbai /opt/djumbai
+	-sudo chown nobody:djumbai /opt/djumbai/fifos
+	-sudo chown nobody:djumbai /opt/djumbai/user
+	-sudo chown nobody:djumbai /opt/djumbai/group
 
 setup: users permissions directories
 
 clean:
-	rm -rf $(BINDIR)
+    rm -rf $(BINDIR)
 
diff --git a/src/djumbai_dequeue/djumbai_dequeue.c b/src/djumbai_dequeue/djumbai_dequeue.c
index 4de5f06..61a4b26 100644
--- a/src/djumbai_dequeue/djumbai_dequeue.c
+++ b/src/djumbai_dequeue/djumbai_dequeue.c
@@ -10,7 +10,7 @@
 int main() {
 	// Change the root of the process so it doesn't have access to anything else.
 	chroot("/opt/djumbai/");
-	const char *message_queue_path = "fifos/message_queue";
+	const char *message_queue_path = "/opt/djumbai/fifos/message_queue";
 
 	if (access(message_queue_path, F_OK) != -1) {
 		// FIFO exists, delete it
diff --git a/src/djumbai_send/djumbai_send.c b/src/djumbai_send/djumbai_send.c
index 20e2998..9b5af6b 100644
--- a/src/djumbai_send/djumbai_send.c
+++ b/src/djumbai_send/djumbai_send.c
@@ -13,7 +13,7 @@ int main() {
 
 	// Open the FIFO for writing
     chroot("/opt/djumbai/");
-	const char *send_fifo_path = "fifos/send_fifo";
+    const char *send_fifo_path = "/opt/djumbai/fifos/send_fifo";
 	if (access(send_fifo_path, F_OK) != -1) {
 		// FIFO exists, delete it
 		if (unlink(send_fifo_path) == -1) {