task: dont wait keypress if shell exited with non-zero status

Also propagate the exit status to fdexit(). See dosemu2/dosemu2#2217
dosemu2 · Jun 4, 2024 · 1bba19c · 1bba19c
1 parent a6902e7
commit 1bba19c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/kernel/procsupt.asm b/kernel/procsupt.asm
@@ -320,7 +320,11 @@ reloc_call_call_p_0:
         int 21h
         mov ds,[cs:_DGROUP_]
         jc .L_1
+        mov ah, 4dh    ; get exit code
+        int 21h
+        push ax
         call _P_0_exit
+        pop ax
         jmp .L_2
 
 .L_1:

diff --git a/kernel/proto.h b/kernel/proto.h
@@ -448,7 +448,7 @@ struct int25regs;
 VOID ASMCFUNC SEGM(HMA_TEXT) int2526_handler(WORD mode,__FAR(struct int25regs) r);
 struct config;
 VOID ASMCFUNC SEGM(HMA_TEXT) P_0(__FAR(const struct config)Config);
-VOID ASMCFUNC SEGM(HMA_TEXT) P_0_exit(void);
+VOID ASMCFUNC SEGM(HMA_TEXT) P_0_exit(unsigned short retcode);
 VOID ASMCFUNC SEGM(HMA_TEXT) P_0_bad(void);
 struct int2f12regs;
 VOID ASMCFUNC SEGM(HMA_TEXT) int2F_12_handler(__FAR(struct int2f12regs) r);

diff --git a/kernel/task.c b/kernel/task.c
@@ -964,12 +964,16 @@ VOID ASMCFUNC P_0(const struct config FAR *Config)
   p0_execblk_p = exb;
 }
 
-VOID ASMCFUNC P_0_exit(void)
+VOID ASMCFUNC P_0_exit(unsigned short retcode)
 {
-  _printf("\nShell %s exited, press any key...\n", GET_PTR(Shell));
-  con_flush_stdin();
-  read_char_stdin(0);
-  fdexit(0);
+  if (retcode == 0) {
+    _printf("\nShell %s exited, press any key...\n", GET_PTR(Shell));
+    con_flush_stdin();
+    read_char_stdin(0);
+  } else {
+    _printf("\nShell %s exited with code 0x%x\n", GET_PTR(Shell), retcode);
+  }
+  fdexit(retcode & 0xff);
 }
 
 VOID ASMCFUNC P_0_bad(void)