Finished proper return of processes

3 files changed, 10 insertions, 11 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 17af36a..194d7df 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -7,7 +7,7 @@ OC = ../cross/opt/bin/i686-elf-objcopy
 
 # Flags to make the binary smaller TODO: Remove after indirect pointer support!
 # TODO: Fix optimization flags (relocation of functions)
-CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -O0
+CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
 
 CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace
 
@@ -18,6 +18,7 @@ all: $(COBJS)
 	@$(CC) -c $(CFLAGS) $< -o $@
 	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc -lgui
 	@$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=)
+# @cp $(@:.o=.elf) ../build/apps/$(@:.o=.dbg)
 
 # %.o: %.c
 # 	@mkdir -p ../build/apps/
diff --git a/apps/init.c b/apps/init.c
index 64fbde3..07977ee 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -10,12 +10,9 @@
 
 int main(int argc, char **argv)
 {
-	(void)argc;
-
 	printf("ARGC: %d\n", argc);
-	printf("ARGV: %x\n", argv);
-	printf("%s loaded.\n", argv[0]);
+	printf("[%s loaded]\n", argv[0]);
 
-	exec("/wm", "wm", argv[1], NULL);
-	return 0;
+	int wm = exec("/wm", "wm", argv[1], NULL);
+	return wm;
 }
diff --git a/apps/wm.c b/apps/wm.c
index c5347e4..88c0451 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -18,10 +18,11 @@ void onkey(u32 scancode)
 
 int main(int argc, char **argv)
 {
+	printf("ARGC: %d\n", argc);
+	printf("[%s loaded]\n", argv[0]);
+
 	struct vbe *vbe = (struct vbe *)argv[1];
 
-	printf("%x\n", argc);
-	printf("%s loaded.\n", argv[0]);
 	printf("VBE: %dx%d\n", vbe->width, vbe->height);
 
 	const u32 color[3] = { 0, 0, 0 };
@@ -30,8 +31,8 @@ int main(int argc, char **argv)
 	gui_init("/font/spleen-16x32.psfu");
 	gui_write(vbe, 50, 50, text, "hallo");
 
-	/* printf("onkey: %x\n", onkey); */
-	/* map(EVENT_KEYBOARD, onkey); */
+	printf("onkey: %x\n", onkey);
+	map(EVENT_KEYBOARD, onkey);
 
 	while (1) {
 	};