Fixed many bugs with wait() and fork()

This also adds many race conditions which really need to be fixed..

3 files changed, 38 insertions, 6 deletions

diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index f3ca614..1d53ee8 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -7,16 +7,27 @@
 
 void main()
 {
+	if (get_pid() != 2) {
+		printf("Wrong PID!\n");
+		exit(1);
+	}
+
 	// TODO: Fix page fault when mallocing
 	printf("Initializing userspace...\n");
 
+	// TODO: Fix occasional race conditions with cli/sti
+	// TODO: Fix scheduler turning off randomly..
 	u32 x;
 	u32 f = fork();
-	if (f == 0)
+	if (f == 0) {
+		printf("Waiting...\n");
 		wait(&x);
-	else
+	} else {
+		printf("Executing...\n");
 		exec("/bin/sh");
+	}
 
 	while (1) {
+		//printf("B");
 	};
 }
\ No newline at end of file
diff --git a/src/userspace/programs/root.c b/src/userspace/programs/root.c
new file mode 100644
index 0000000..d02f72c
--- /dev/null
+++ b/src/userspace/programs/root.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <syscall.h>
+
+// This process only exists because it can't crash
+void main()
+{
+	if (get_pid() != 1) {
+		printf("Wrong PID!\n");
+		exit(1);
+	}
+
+	exec("/bin/init");
+	printf("The init process crashed!");
+}
\ No newline at end of file
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index bb1c9ea..12f8b2c 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,4 +1,7 @@
+#include <stdint.h>
 #include <stdio.h>
+#include <stddef.h>
+#include <common.h>
 #include <unistd.h>
 #include <syscall.h>
 #include <gui.h>
@@ -7,9 +10,12 @@ void main()
 {
 	printf("[~] ");
 
-	while (1) {
-		putch(getch());
-	}
+	/* while (1) { */
+	/* 	putch(getch()); */
+	/* } */
 
-	syscall_halt();
+	/* syscall_halt(); */
+	while (1) {
+		//printf("A");
+	};
 }
\ No newline at end of file