ShellPkg: Update Debug1 profile commands response output

Updates to Debug1 profile commands response output. 
Updating Debug1 profile commands source code to include command name as a prefix in error message.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16729 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 16 insertions, 16 deletions

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
index 1d6e428445..c0585fa128 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
@@ -1,7 +1,7 @@
 /** @file

   Main entry point of editor

   

-  (C) Copyright 2014, Hewlett-Packard Development Company, L.P.

+  Copyright (c) 2014 - 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -74,7 +74,7 @@ ShellCommandRunHexEdit (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"hexedit", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -86,10 +86,10 @@ ShellCommandRunHexEdit (
     //

     if (ShellCommandLineGetFlag(Package, L"-d")){

       if (ShellCommandLineGetCount(Package) < 4) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (ShellCommandLineGetCount(Package) > 4) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         WhatToDo = FileTypeDiskBuffer;

@@ -98,7 +98,7 @@ ShellCommandRunHexEdit (
         Size    = ShellStrToUintn(ShellCommandLineGetRawValue(Package, 3));

       }

       if (Offset == (UINTN)-1 || Size == (UINTN)-1) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDebug1HiiHandle, L"-d");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDebug1HiiHandle, L"hexedit", L"-d");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       }

     }

@@ -108,15 +108,15 @@ ShellCommandRunHexEdit (
     //

     if (ShellCommandLineGetFlag(Package, L"-f") && (WhatToDo == FileTypeNone)){

       if (ShellCommandLineGetCount(Package) < 2) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (ShellCommandLineGetCount(Package) > 2) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         Name      = ShellCommandLineGetRawValue(Package, 1);

         if (Name == NULL || !IsValidFileName(Name)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Name);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"hexedit", Name);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           WhatToDo  = FileTypeFileBuffer;

@@ -129,10 +129,10 @@ ShellCommandRunHexEdit (
     //

     if (ShellCommandLineGetFlag(Package, L"-m") && (WhatToDo == FileTypeNone)){

       if (ShellCommandLineGetCount(Package) < 3) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (ShellCommandLineGetCount(Package) > 3) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         WhatToDo = FileTypeMemBuffer;

@@ -143,10 +143,10 @@ ShellCommandRunHexEdit (
     Name = ShellCommandLineGetRawValue(Package, 1);

     if (WhatToDo == FileTypeNone && Name != NULL) {

       if (ShellCommandLineGetCount(Package) > 2) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (!IsValidFileName(Name)) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Name);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"hexedit", Name);  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         WhatToDo  = FileTypeFileBuffer;

@@ -154,7 +154,7 @@ ShellCommandRunHexEdit (
     } else if (WhatToDo == FileTypeNone) {

       if (gEfiShellProtocol->GetCurDir(NULL) == NULL) {

         ShellStatus = SHELL_NOT_FOUND;

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle, L"hexedit");  

       } else {

         NewName = EditGetDefaultFileName(L"bin");

         Name = NewName;

@@ -163,10 +163,10 @@ ShellCommandRunHexEdit (
     }

 

     if (ShellStatus == SHELL_SUCCESS && WhatToDo == FileTypeNone) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (WhatToDo == FileTypeFileBuffer && ShellGetCurrentDir(NULL) == NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle, L"hexedit");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     }

 

@@ -252,7 +252,7 @@ ShellCommandRunHexEdit (
       // print editor exit code on screen

       //

       if (Status == EFI_OUT_OF_RESOURCES) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellDebug1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellDebug1HiiHandle, L"hexedit");  

       } else if (EFI_ERROR(Status)){

         if (Buffer != NULL) {

           if (StrCmp (Buffer, L"") != 0) {