X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FApplication%2FShell%2FShell.c;h=3e4706c288dbd2cbac12ce28af1c34fbbfb73e10;hp=aa4dfd37ab6503c4c12bbaeb6e3dcd8d2917a80e;hb=ce68d3bc68eda5ce919b90aea8db094ed4b64c34;hpb=5559a41aad06da01e4f2219e9a4edb123d2a03d3

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index aa4dfd37ab..3e4706c288 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -23,22 +23,24 @@ SHELL_INFO ShellInfoObject = {
   FALSE,
   FALSE,
   {
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
+    {{
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    }},
     0,
     NULL,
     NULL
   },
-  {0,0},
+  {{NULL, NULL}, NULL},
   {
-    {0,0},
+    {{NULL, NULL}, NULL},
     0,
     0,
     TRUE
@@ -50,8 +52,12 @@ SHELL_INFO ShellInfoObject = {
   NULL,
   NULL,
   NULL,
-  {0,0,NULL,NULL},
-  {0,0},
+  {{NULL, NULL}, NULL, NULL},
+  {{NULL, NULL}, NULL, NULL},
+  NULL,
+  NULL,
+  NULL,
+  NULL,
   NULL,
   NULL,
   NULL,
@@ -1310,6 +1316,7 @@ RunCommand(
   )
 {
   EFI_STATUS                Status;
+  EFI_STATUS                StatusCode;
   CHAR16                    *CommandName;
   SHELL_STATUS              ShellStatus;
   UINTN                     Argc;
@@ -1557,11 +1564,26 @@ RunCommand(
               DevPath,
               PostVariableCmdLine,
               NULL,
-              NULL
+              &StatusCode
              );
+
+            //
+            // Updatet last error status.
+            //
+            UnicodeSPrint(LeString, sizeof(LeString)*sizeof(LeString[0]), L"0x%08x", StatusCode);
+            DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE););
+            InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE);
           }
         }
       }
+
+      //
+      // Print some error info.
+      //
+      if (EFI_ERROR(Status)) {
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR), ShellInfoObject.HiiHandle, (VOID*)(Status));
+      }
+
       CommandName = StrnCatGrow(&CommandName, NULL, ShellInfoObject.NewShellParametersProtocol->Argv[0], 0);
 
       RestoreArgcArgv(ShellInfoObject.NewShellParametersProtocol, &Argv, &Argc);
@@ -1858,6 +1880,9 @@ RunScriptFileHandle (
           Status = EFI_SUCCESS;
           break;
         }
+        if (ShellGetExecutionBreakFlag()) {
+          break;
+        }
         if (EFI_ERROR(Status)) {
           break;
         }