ShellPkg: Update Level1 profile commands response output

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel1CommandsLib / Goto.c

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
index 3e5a59c5756019d325cbca3d4c8f3a27f00960b3..cf97836ab399a7e90d19ef9e6bb94428db1e8556 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
@@ -1,6 +1,7 @@
 /** @file\r
   Main file for goto shell level 1 function.\r
 \r
+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
   Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -33,6 +34,7 @@ ShellCommandRunGoto (
   SHELL_STATUS        ShellStatus;\r
   CHAR16              *CompareString;\r
   UINTN               Size;\r
+  SCRIPT_FILE         *CurrentScriptFile;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
   CompareString       = NULL;\r
@@ -57,7 +59,7 @@ ShellCommandRunGoto (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel1HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel1HiiHandle, L"goto", ProblemParam);\r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -65,10 +67,10 @@ ShellCommandRunGoto (
     }\r
   } else {\r
     if (ShellCommandLineGetRawValue(Package, 2) != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"goto");\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetRawValue(Package, 1) == NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"goto");\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       Size = 0;\r
@@ -79,6 +81,7 @@ ShellCommandRunGoto (
       // Check forwards and then backwards for a label...\r
       //\r
       if (!MoveToTag(GetNextNode, L"endfor", L"for", CompareString, ShellCommandGetCurrentScriptFile(), FALSE, FALSE, TRUE)) {\r
+        CurrentScriptFile = ShellCommandGetCurrentScriptFile();\r
         ShellPrintHiiEx(\r
           -1, \r
           -1, \r
@@ -87,9 +90,9 @@ ShellCommandRunGoto (
           gShellLevel1HiiHandle, \r
           CompareString, \r
           L"Goto", \r
-          ShellCommandGetCurrentScriptFile()!=NULL\r
-            &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL\r
-              ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);\r
+          CurrentScriptFile!=NULL \r
+            && CurrentScriptFile->CurrentCommand!=NULL\r
+            ? CurrentScriptFile->CurrentCommand->Line:0);\r
         ShellStatus = SHELL_NOT_FOUND;\r
       }\r
     FreePool(CompareString);\r