EditTitleBar - Remove ASSERT. Complete display output for Disk and Memory output.

HexEdit      - Add more user input verification.  Fix output display.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11517 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
index 08d01ab09c617847f78918fe14d99081c9299c03..c29ecc00fd4b12ab96ce1bb0153638c18fd0cbb6 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
@@ -185,7 +185,7 @@ MainTitleBarRefresh (
       //\r
       // Print the offset.\r
       //\r
-      ASSERT(FALSE);\r
+      ShellPrintEx (-1,-1, L"Offset %X | Size %X", Offset, Size);\r
     case FileTypeFileBuffer:\r
       break;\r
     default:\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
index 1f5e1c908d8a4cf7f885771a2d4f827ed772c4c0..edd2f67650c6084ed11071de5f8f18bf4d9260c1 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
@@ -147,12 +147,15 @@ ShellCommandRunHexEdit (
     }\r
     Name = ShellCommandLineGetRawValue(Package, 1);\r
     if (WhatToDo == FileTypeNone && Name != NULL) {\r
-        if (!IsValidFileName(Name)) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Name);\r
-          ShellStatus = SHELL_INVALID_PARAMETER;\r
-        } else {\r
-          WhatToDo  = FileTypeFileBuffer;\r
-        }\r
+      if (ShellCommandLineGetCount(Package) > 2) {\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);\r
+        ShellStatus = SHELL_INVALID_PARAMETER;\r
+      } else if (!IsValidFileName(Name)) {\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, Name);\r
+        ShellStatus = SHELL_INVALID_PARAMETER;\r
+      } else {\r
+        WhatToDo  = FileTypeFileBuffer;\r
+      }\r
     } else if (WhatToDo == FileTypeNone) {\r
       if (gEfiShellProtocol->GetCurDir(NULL) == NULL) {\r
         ShellStatus = SHELL_NOT_FOUND;\r
@@ -235,7 +238,7 @@ ShellCommandRunHexEdit (
           //\r
           // back up the status string\r
           //\r
-          Buffer = CatSPrint (NULL, L"%s", StatusBarGetString());\r
+          Buffer = CatSPrint (NULL, L"%s\r\n", StatusBarGetString());\r
         }\r
       }\r
 \r
@@ -261,7 +264,7 @@ ShellCommandRunHexEdit (
             //\r
             // print out the status string\r
             //\r
-            ShellPrintEx(-1, -1, L"%s", gShellDebug1HiiHandle, Buffer);\r
+            ShellPrintEx(-1, -1, L"%s", Buffer);\r
           } else {\r
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gShellDebug1HiiHandle);\r
           }\r