/** @file\r
Main file for Comp shell Debug1 function.\r
\r
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<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
\r
#include "UefiShellDebug1CommandsLib.h"\r
\r
+/**\r
+ Function for 'comp' command.\r
+\r
+ @param[in] ImageHandle Handle to the Image (NULL if Internal).\r
+ @param[in] SystemTable Pointer to the System Table (NULL if Internal).\r
+**/\r
SHELL_STATUS\r
EFIAPI\r
ShellCommandRunComp (\r
UINTN DataSizeFromFile2;\r
CHAR16 *FileName1;\r
CHAR16 *FileName2;\r
+ CONST CHAR16 *TempParam;\r
+ UINTN ErrorAddress;\r
\r
ErrorCount = 0;\r
ShellStatus = SHELL_SUCCESS;\r
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), gShellDebug1HiiHandle, ProblemParam);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"comp", ProblemParam); \r
FreePool(ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
}\r
} else {\r
if (ShellCommandLineGetCount(Package) > 3) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"comp"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (ShellCommandLineGetCount(Package) < 3) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"comp"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- FileName1 = ShellFindFilePath(ShellCommandLineGetRawValue(Package, 1));\r
- FileName2 = ShellFindFilePath(ShellCommandLineGetRawValue(Package, 2));\r
- Status = ShellOpenFileByName(FileName1, &FileHandle1, EFI_FILE_MODE_READ, 0);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_OPEN_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 1), Status);\r
+ TempParam = ShellCommandLineGetRawValue(Package, 1);\r
+ ASSERT(TempParam != NULL);\r
+ FileName1 = ShellFindFilePath(TempParam);\r
+ if (FileName1 == NULL) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"comp", TempParam); \r
ShellStatus = SHELL_NOT_FOUND;\r
+ } else {\r
+ Status = ShellOpenFileByName(FileName1, &FileHandle1, EFI_FILE_MODE_READ, 0);\r
+ if (EFI_ERROR(Status)) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"comp", TempParam); \r
+ ShellStatus = SHELL_NOT_FOUND;\r
+ }\r
}\r
- Status = ShellOpenFileByName(FileName2, &FileHandle2, EFI_FILE_MODE_READ, 0);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_OPEN_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 2), Status);\r
+ TempParam = ShellCommandLineGetRawValue(Package, 2);\r
+ ASSERT(TempParam != NULL);\r
+ FileName2 = ShellFindFilePath(TempParam);\r
+ if (FileName2 == NULL) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"comp", TempParam); \r
ShellStatus = SHELL_NOT_FOUND;\r
- }\r
- if (FileHandleIsDirectory(FileHandle1) == EFI_SUCCESS){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, FileName1);\r
- ShellStatus = SHELL_INVALID_PARAMETER;\r
- }\r
- if (FileHandleIsDirectory(FileHandle2) == EFI_SUCCESS){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, FileName2);\r
- ShellStatus = SHELL_INVALID_PARAMETER;\r
+ } else {\r
+ Status = ShellOpenFileByName(FileName2, &FileHandle2, EFI_FILE_MODE_READ, 0);\r
+ if (EFI_ERROR(Status)) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"comp", TempParam); \r
+ ShellStatus = SHELL_NOT_FOUND;\r
+ }\r
}\r
if (ShellStatus == SHELL_SUCCESS) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_HEADER), gShellDebug1HiiHandle, FileName1, FileName2);\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
+\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
}\r
}\r
}\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
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
FileName2,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile2, ADF_File21, ADF_File22, ADF_File23,\r
DataFromFile2, ADF_File21, ADF_File22, ADF_File23\r
);\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile1, ADF_File11, ADF_File12,\r
DataFromFile1, ADF_File11, ADF_File12,\r
FileName2,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile2, ADF_File21, ADF_File22,\r
DataFromFile2, ADF_File21, ADF_File22\r
);\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile1, ADF_File11,\r
DataFromFile1, ADF_File11,\r
FileName2,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile2, ADF_File21,\r
DataFromFile2, ADF_File21\r
);\r
gShellDebug1HiiHandle,\r
++ErrorCount,\r
FileName1,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile1,\r
DataFromFile1,\r
FileName2,\r
- LoopVar,\r
+ ErrorAddress,\r
DataFromFile2,\r
DataFromFile2\r
);\r
ShellStatus = SHELL_NOT_EQUAL;\r
}\r
}\r
- }\r
- if (ErrorCount == 0) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_PASS), gShellDebug1HiiHandle);\r
- } else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_FAIL), gShellDebug1HiiHandle);\r
+ if (ErrorCount == 0) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_PASS), gShellDebug1HiiHandle);\r
+ } else {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_FAIL), gShellDebug1HiiHandle);\r
+ }\r
}\r
}\r
\r
ShellCommandLineFreeVarList (Package);\r
}\r
- if (FileName1 != NULL) {\r
- FreePool(FileName1);\r
- }\r
- if (FileName2 != NULL) {\r
- FreePool(FileName2);\r
- }\r
+ SHELL_FREE_NON_NULL(FileName1);\r
+ SHELL_FREE_NON_NULL(FileName2);\r
+\r
if (FileHandle1 != NULL) {\r
gEfiShellProtocol->CloseFile(FileHandle1);\r
}\r