The comp command was potentially displaying the incorrect offset into the file due to comparing 3 extra bytes for difference groups.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
Reviewed-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15558
6f19259b-4bc3-4df7-8a09-
765794883524
/** @file\r
Main file for Comp shell Debug1 function.\r
\r
/** @file\r
Main file for Comp shell Debug1 function.\r
\r
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 2014, 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
which accompanies this distribution. The full text of the license may be found at\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
CHAR16 *FileName1;\r
CHAR16 *FileName2;\r
CONST CHAR16 *TempParam;\r
CHAR16 *FileName1;\r
CHAR16 *FileName2;\r
CONST CHAR16 *TempParam;\r
\r
ErrorCount = 0;\r
ShellStatus = SHELL_SUCCESS;\r
\r
ErrorCount = 0;\r
ShellStatus = SHELL_SUCCESS;\r
Status = gEfiShellProtocol->ReadFile(FileHandle2, &DataSizeFromFile2, &DataFromFile2);\r
ASSERT_EFI_ERROR(Status);\r
if (DataFromFile1 != DataFromFile2) {\r
Status = gEfiShellProtocol->ReadFile(FileHandle2, &DataSizeFromFile2, &DataFromFile2);\r
ASSERT_EFI_ERROR(Status);\r
if (DataFromFile1 != DataFromFile2) {\r
+ ErrorAddress = LoopVar;\r
ADF_File11 = 0;\r
ADF_File12 = 0;\r
ADF_File13 = 0;\r
ADF_File21 = 0;\r
ADF_File22 = 0;\r
ADF_File23 = 0;\r
ADF_File11 = 0;\r
ADF_File12 = 0;\r
ADF_File13 = 0;\r
ADF_File21 = 0;\r
ADF_File22 = 0;\r
ADF_File23 = 0;\r
+\r
+ //\r
+ // Now check the next 3 bytes if possible. This will make output\r
+ // cleaner when there are a sequence of differences.\r
+ //\r
if (LoopVar + 1 < Size1) {\r
LoopVar++;\r
DataSizeFromFile1 = 1;\r
if (LoopVar + 1 < Size1) {\r
LoopVar++;\r
DataSizeFromFile1 = 1;\r
+\r
+ //\r
+ // Print out based on highest of the 4 bytes that are different.\r
+ //\r
if (ADF_File13 != ADF_File23) {\r
ShellPrintHiiEx(\r
-1,\r
if (ADF_File13 != ADF_File23) {\r
ShellPrintHiiEx(\r
-1,\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
FileName2,\r
DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
FileName2,\r
DataFromFile2, ADF_File21, ADF_File22, ADF_File23,\r
DataFromFile2, ADF_File21, ADF_File22, ADF_File23\r
);\r
DataFromFile2, ADF_File21, ADF_File22, ADF_File23,\r
DataFromFile2, ADF_File21, ADF_File22, ADF_File23\r
);\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
DataFromFile1, ADF_File11, ADF_File12,\r
DataFromFile1, ADF_File11, ADF_File12,\r
FileName2,\r
DataFromFile1, ADF_File11, ADF_File12,\r
DataFromFile1, ADF_File11, ADF_File12,\r
FileName2,\r
DataFromFile2, ADF_File21, ADF_File22,\r
DataFromFile2, ADF_File21, ADF_File22\r
);\r
DataFromFile2, ADF_File21, ADF_File22,\r
DataFromFile2, ADF_File21, ADF_File22\r
);\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
DataFromFile1, ADF_File11,\r
DataFromFile1, ADF_File11,\r
FileName2,\r
DataFromFile1, ADF_File11,\r
DataFromFile1, ADF_File11,\r
FileName2,\r
DataFromFile2, ADF_File21,\r
DataFromFile2, ADF_File21\r
);\r
DataFromFile2, ADF_File21,\r
DataFromFile2, ADF_File21\r
);\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
DataFromFile1,\r
DataFromFile1,\r
FileName2,\r
DataFromFile1,\r
DataFromFile1,\r
FileName2,\r
DataFromFile2,\r
DataFromFile2\r
);\r
DataFromFile2,\r
DataFromFile2\r
);\r