From 64ec8aa157e5d5d09372def37cbab00628e1e5f5 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 6 Apr 2021 22:20:58 +0200
Subject: Made exec syscall relative using app name

My plan is to implement a mobile-OS-like sandboxing using manifests
and permission middlewares. Let's see if I can manage to do this
without sacrificing too much performance.

I'm also wondering whether I should implement open/close syscalls
which would result in a cleaner block/unblock mechanism. I need to
think. Hmmm.. Naa
---
 apps/chess/Makefile | 3 ++-
 apps/idle/Makefile  | 3 ++-
 apps/init/Makefile  | 3 ++-
 apps/init/init.c    | 4 ++--
 apps/test/Makefile  | 3 ++-
 apps/wm/Makefile    | 3 ++-
 6 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/chess/Makefile b/apps/chess/Makefile
index b22cb1a..549b603 100644
--- a/apps/chess/Makefile
+++ b/apps/chess/Makefile
@@ -3,7 +3,8 @@
 OBJS = chess.o
 
 all: $(OBJS)
-	@$(LD) -o $(BUILD)/apps/chess $(LDFLAGS) $< -lgui -ltxt -lc
+	@mkdir -p $(BUILD)/apps/chess/
+	@$(LD) -o $(BUILD)/apps/chess/exec $(LDFLAGS) $< -lgui -ltxt -lc
 
 clean:
 	@$(RM) -f $(OBJS)
diff --git a/apps/idle/Makefile b/apps/idle/Makefile
index 3060ae3..dc979b3 100644
--- a/apps/idle/Makefile
+++ b/apps/idle/Makefile
@@ -3,7 +3,8 @@
 OBJS = idle.o
 
 all: $(OBJS)
-	@$(LD) -o $(BUILD)/apps/idle $(LDFLAGS) $< -lc
+	@mkdir -p $(BUILD)/apps/idle/
+	@$(LD) -o $(BUILD)/apps/idle/exec $(LDFLAGS) $< -lc
 
 clean:
 	@$(RM) -f $(OBJS)
diff --git a/apps/init/Makefile b/apps/init/Makefile
index 7dec3e8..b56c344 100644
--- a/apps/init/Makefile
+++ b/apps/init/Makefile
@@ -3,7 +3,8 @@
 OBJS = init.o
 
 all: $(OBJS)
-	@$(LD) -o $(BUILD)/apps/init $(LDFLAGS) $< -lc
+	@mkdir -p $(BUILD)/apps/init/
+	@$(LD) -o $(BUILD)/apps/init/exec $(LDFLAGS) $< -lc
 
 clean:
 	@$(RM) -f $(OBJS)
diff --git a/apps/init/init.c b/apps/init/init.c
index a7d07df..6e06dbe 100644
--- a/apps/init/init.c
+++ b/apps/init/init.c
@@ -9,8 +9,8 @@ int main(int argc, char **argv)
 	UNUSED(argc);
 	UNUSED(argv);
 
-	assert(exec("/bin/wm", "wm", NULL) == EOK);
-	/* assert(exec("/bin/chess", "chess", NULL) == EOK); */
+	assert(exec("wm", NULL) == EOK);
+	/* assert(exec("chess", NULL) == EOK); */
 
 	return 0;
 }
diff --git a/apps/test/Makefile b/apps/test/Makefile
index 7959154..cbd3b57 100644
--- a/apps/test/Makefile
+++ b/apps/test/Makefile
@@ -3,7 +3,8 @@
 OBJS = test.o
 
 all: $(OBJS)
-	@$(LD) -o $(BUILD)/apps/test $(LDFLAGS) $< -lc
+	@mkdir -p $(BUILD)/apps/test/
+	@$(LD) -o $(BUILD)/apps/test/exec $(LDFLAGS) $< -lc
 
 clean:
 	@$(RM) -f $(OBJS)
diff --git a/apps/wm/Makefile b/apps/wm/Makefile
index 66f68f6..48ed1d3 100644
--- a/apps/wm/Makefile
+++ b/apps/wm/Makefile
@@ -3,7 +3,8 @@
 OBJS = wm.o
 
 all: $(OBJS)
-	@$(LD) -o $(BUILD)/apps/wm $(LDFLAGS) $< -lgui -ltxt -lc
+	@mkdir -p $(BUILD)/apps/wm/
+	@$(LD) -o $(BUILD)/apps/wm/exec $(LDFLAGS) $< -lgui -ltxt -lc
 
 clean:
 	@$(RM) -f $(OBJS)
-- 
cgit v1.2.3