apps/src/sh.c

@@ -5,7 +5,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-static int status = 0;
+static int status;
 
 typedef struct
 {
@@ -16,8 +16,6 @@ typedef struct
 
 void show_prompt()
 {
-    if (status) { printf("%d [%ld]> ", WEXITSTATUS(status), getpid()); }
-    else
     printf("[%ld]> ", getpid());
 }
 
@@ -119,6 +117,8 @@ void command_execute(command* cmd)
     }
     int exit_status = WEXITSTATUS(status);
     if (exit_status == -2 || exit_status == -3) printf("(PID %ld) Segmentation fault\n", result);
+    else if (exit_status)
+        printf("Exited with code %d\n", WEXITSTATUS(status));
     command_clear(cmd);
     show_prompt();
 }

kernel/src/thread/Scheduler.cpp

@@ -490,13 +490,7 @@ void sys_waitpid(Context* context, long pid, int* wstatus,
             *kwstatus = (int)(child->exit_status & 0xff);
             release_user_ref(kwstatus);
         }
-        else
+        else { kinfoln("wstatus ptr is invalid: %p", (void*)wstatus); }
-        {
-            kinfoln("wstatus ptr is invalid: %p", (void*)wstatus);
-            child->state = child->Exited;
-            context->rax = -EFAULT;
-            return;
-        }
     }
     child->state = child->Exited;
     context->rax = (long)child->id;