\r
#include "UefiShellDebug1CommandsLib.h"\r
\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-n", TypeValue},\r
- {L"-s", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-n", TypeValue },\r
+ { L"-s", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
\r
typedef enum {\r
OutOfDiffPoint,\r
// Buffer type, for reading both file operands in chunks.\r
//\r
typedef struct {\r
- UINT8 *Data; // dynamically allocated buffer\r
- UINTN Allocated; // the allocated size of Data\r
- UINTN Next; // next position in Data to fetch a byte at\r
- UINTN Left; // number of bytes left in Data for fetching at Next\r
+ UINT8 *Data; // dynamically allocated buffer\r
+ UINTN Allocated; // the allocated size of Data\r
+ UINTN Next; // next position in Data to fetch a byte at\r
+ UINTN Left; // number of bytes left in Data for fetching at Next\r
} FILE_BUFFER;\r
\r
/**\r
\r
**/\r
VOID\r
-PrintDifferentPoint(\r
+PrintDifferentPoint (\r
CONST CHAR16 *FileName,\r
CHAR16 *FileTag,\r
UINT8 *Buffer,\r
UINT64 DifferentBytes\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
ShellPrintEx (-1, -1, L"%s: %s\r\n %08x:", FileTag, FileName, Address);\r
\r
// Print data in char-format.\r
//\r
for (Index = 0; Index < BufferSize; Index++) {\r
- if (Buffer[Index] >= 0x20 && Buffer[Index] <= 0x7E) {\r
+ if ((Buffer[Index] >= 0x20) && (Buffer[Index] <= 0x7E)) {\r
ShellPrintEx (-1, -1, L"%c", Buffer[Index]);\r
} else {\r
//\r
STATIC\r
VOID\r
FileBufferInit (\r
- OUT FILE_BUFFER *FileBuffer\r
+ OUT FILE_BUFFER *FileBuffer\r
)\r
{\r
FileBuffer->Allocated = PcdGet32 (PcdShellFileOperationSize);\r
STATIC\r
VOID\r
FileBufferUninit (\r
- IN OUT FILE_BUFFER *FileBuffer\r
+ IN OUT FILE_BUFFER *FileBuffer\r
)\r
{\r
SHELL_FREE_NON_NULL (FileBuffer->Data);\r
STATIC\r
EFI_STATUS\r
FileBufferReadByte (\r
- IN SHELL_FILE_HANDLE FileHandle,\r
- IN OUT FILE_BUFFER *FileBuffer,\r
- OUT UINTN *BytesRead,\r
- OUT UINT8 *Byte\r
+ IN SHELL_FILE_HANDLE FileHandle,\r
+ IN OUT FILE_BUFFER *FileBuffer,\r
+ OUT UINTN *BytesRead,\r
+ OUT UINT8 *Byte\r
)\r
{\r
- UINTN ReadSize;\r
- EFI_STATUS Status;\r
+ UINTN ReadSize;\r
+ EFI_STATUS Status;\r
\r
if (FileBuffer->Left == 0) {\r
ReadSize = FileBuffer->Allocated;\r
- Status = gEfiShellProtocol->ReadFile (FileHandle, &ReadSize,\r
- FileBuffer->Data);\r
+ Status = gEfiShellProtocol->ReadFile (\r
+ FileHandle,\r
+ &ReadSize,\r
+ FileBuffer->Data\r
+ );\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
if (ReadSize == 0) {\r
*BytesRead = 0;\r
return EFI_SUCCESS;\r
}\r
+\r
FileBuffer->Next = 0;\r
FileBuffer->Left = ReadSize;\r
}\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- LIST_ENTRY *Package;\r
- CHAR16 *ProblemParam;\r
- CHAR16 *FileName1;\r
- CHAR16 *FileName2;\r
- CONST CHAR16 *TempParam;\r
- SHELL_STATUS ShellStatus;\r
- SHELL_FILE_HANDLE FileHandle1;\r
- SHELL_FILE_HANDLE FileHandle2;\r
- UINT64 Size1;\r
- UINT64 Size2;\r
- UINT64 DifferentBytes;\r
- UINT64 DifferentCount;\r
- UINT8 DiffPointNumber;\r
- UINT8 OneByteFromFile1;\r
- UINT8 OneByteFromFile2;\r
- UINT8 *DataFromFile1;\r
- UINT8 *DataFromFile2;\r
- FILE_BUFFER FileBuffer1;\r
- FILE_BUFFER FileBuffer2;\r
- UINTN InsertPosition1;\r
- UINTN InsertPosition2;\r
- UINTN DataSizeFromFile1;\r
- UINTN DataSizeFromFile2;\r
- UINTN TempAddress;\r
- UINTN Index;\r
- UINTN DiffPointAddress;\r
- READ_STATUS ReadStatus;\r
-\r
- ShellStatus = SHELL_SUCCESS;\r
- Status = EFI_SUCCESS;\r
- FileName1 = NULL;\r
- FileName2 = NULL;\r
- FileHandle1 = NULL;\r
- FileHandle2 = NULL;\r
- DataFromFile1 = NULL;\r
- DataFromFile2 = NULL;\r
- ReadStatus = OutOfDiffPoint;\r
- DifferentCount = 10;\r
- DifferentBytes = 4;\r
- DiffPointNumber = 0;\r
- InsertPosition1 = 0;\r
- InsertPosition2 = 0;\r
- TempAddress = 0;\r
- DiffPointAddress = 0;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *ProblemParam;\r
+ CHAR16 *FileName1;\r
+ CHAR16 *FileName2;\r
+ CONST CHAR16 *TempParam;\r
+ SHELL_STATUS ShellStatus;\r
+ SHELL_FILE_HANDLE FileHandle1;\r
+ SHELL_FILE_HANDLE FileHandle2;\r
+ UINT64 Size1;\r
+ UINT64 Size2;\r
+ UINT64 DifferentBytes;\r
+ UINT64 DifferentCount;\r
+ UINT8 DiffPointNumber;\r
+ UINT8 OneByteFromFile1;\r
+ UINT8 OneByteFromFile2;\r
+ UINT8 *DataFromFile1;\r
+ UINT8 *DataFromFile2;\r
+ FILE_BUFFER FileBuffer1;\r
+ FILE_BUFFER FileBuffer2;\r
+ UINTN InsertPosition1;\r
+ UINTN InsertPosition2;\r
+ UINTN DataSizeFromFile1;\r
+ UINTN DataSizeFromFile2;\r
+ UINTN TempAddress;\r
+ UINTN Index;\r
+ UINTN DiffPointAddress;\r
+ READ_STATUS ReadStatus;\r
+\r
+ ShellStatus = SHELL_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ FileName1 = NULL;\r
+ FileName2 = NULL;\r
+ FileHandle1 = NULL;\r
+ FileHandle2 = NULL;\r
+ DataFromFile1 = NULL;\r
+ DataFromFile2 = NULL;\r
+ ReadStatus = OutOfDiffPoint;\r
+ DifferentCount = 10;\r
+ DifferentBytes = 4;\r
+ DiffPointNumber = 0;\r
+ InsertPosition1 = 0;\r
+ InsertPosition2 = 0;\r
+ TempAddress = 0;\r
+ DiffPointAddress = 0;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
- Status = ShellInitialize();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = ShellInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (ParamList, &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, L"comp", ProblemParam);\r
- FreePool(ProblemParam);\r
+ if (EFI_ERROR (Status)) {\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\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
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
- if (ShellCommandLineGetCount(Package) > 3) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"comp");\r
+ if (ShellCommandLineGetCount (Package) > 3) {\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, L"comp");\r
+ } else if (ShellCommandLineGetCount (Package) < 3) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"comp");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- TempParam = ShellCommandLineGetRawValue(Package, 1);\r
- ASSERT(TempParam != NULL);\r
- FileName1 = ShellFindFilePath(TempParam);\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
+ 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
+ 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
- TempParam = ShellCommandLineGetRawValue(Package, 2);\r
- ASSERT(TempParam != NULL);\r
- FileName2 = ShellFindFilePath(TempParam);\r
+\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
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"comp", TempParam);\r
ShellStatus = SHELL_NOT_FOUND;\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
+ 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
+\r
if (ShellStatus == SHELL_SUCCESS) {\r
- Status = gEfiShellProtocol->GetFileSize(FileHandle1, &Size1);\r
- ASSERT_EFI_ERROR(Status);\r
- Status = gEfiShellProtocol->GetFileSize(FileHandle2, &Size2);\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = gEfiShellProtocol->GetFileSize (FileHandle1, &Size1);\r
+ ASSERT_EFI_ERROR (Status);\r
+ Status = gEfiShellProtocol->GetFileSize (FileHandle2, &Size2);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
if (ShellCommandLineGetFlag (Package, L"-n")) {\r
TempParam = ShellCommandLineGetValue (Package, L"-n");\r
DifferentCount = MAX_UINTN;\r
} else {\r
Status = ShellConvertStringToUint64 (TempParam, &DifferentCount, FALSE, TRUE);\r
- if (EFI_ERROR(Status) || DifferentCount == 0) {\r
+ if (EFI_ERROR (Status) || (DifferentCount == 0)) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDebug1HiiHandle, L"comp", TempParam, L"-n");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64 (TempParam, &DifferentBytes, FALSE, TRUE);\r
- if (EFI_ERROR(Status) || DifferentBytes == 0) {\r
+ if (EFI_ERROR (Status) || (DifferentBytes == 0)) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDebug1HiiHandle, L"comp", TempParam, L"-s");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
DataFromFile2 = AllocateZeroPool ((UINTN)DifferentBytes);\r
FileBufferInit (&FileBuffer1);\r
FileBufferInit (&FileBuffer2);\r
- if (DataFromFile1 == NULL || DataFromFile2 == NULL ||\r
- FileBuffer1.Data == NULL || FileBuffer2.Data == NULL) {\r
+ if ((DataFromFile1 == NULL) || (DataFromFile2 == NULL) ||\r
+ (FileBuffer1.Data == NULL) || (FileBuffer2.Data == NULL))\r
+ {\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
SHELL_FREE_NON_NULL (DataFromFile1);\r
SHELL_FREE_NON_NULL (DataFromFile2);\r
while (DiffPointNumber < DifferentCount) {\r
DataSizeFromFile1 = 1;\r
DataSizeFromFile2 = 1;\r
- OneByteFromFile1 = 0;\r
- OneByteFromFile2 = 0;\r
- Status = FileBufferReadByte (FileHandle1, &FileBuffer1,\r
- &DataSizeFromFile1, &OneByteFromFile1);\r
+ OneByteFromFile1 = 0;\r
+ OneByteFromFile2 = 0;\r
+ Status = FileBufferReadByte (\r
+ FileHandle1,\r
+ &FileBuffer1,\r
+ &DataSizeFromFile1,\r
+ &OneByteFromFile1\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
- Status = FileBufferReadByte (FileHandle2, &FileBuffer2,\r
- &DataSizeFromFile2, &OneByteFromFile2);\r
+ Status = FileBufferReadByte (\r
+ FileHandle2,\r
+ &FileBuffer2,\r
+ &DataSizeFromFile2,\r
+ &OneByteFromFile2\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
TempAddress++;\r
// 2.If no more char in File1 or File2, The ReadStatus is InPrevDiffPoint forever.\r
// So the previous different point is the last one, then break the while block.\r
//\r
- if ( (DataSizeFromFile1 == 0 && InsertPosition1 == 0 && DataSizeFromFile2 == 0 && InsertPosition2 == 0) ||\r
- (ReadStatus == InPrevDiffPoint && (DataSizeFromFile1 == 0 || DataSizeFromFile2 == 0))\r
- ) {\r
+ if (((DataSizeFromFile1 == 0) && (InsertPosition1 == 0) && (DataSizeFromFile2 == 0) && (InsertPosition2 == 0)) ||\r
+ ((ReadStatus == InPrevDiffPoint) && ((DataSizeFromFile1 == 0) || (DataSizeFromFile2 == 0)))\r
+ )\r
+ {\r
break;\r
}\r
\r
if (ReadStatus == OutOfDiffPoint) {\r
if (OneByteFromFile1 != OneByteFromFile2) {\r
- ReadStatus = InDiffPoint;\r
+ ReadStatus = InDiffPoint;\r
DiffPointAddress = TempAddress;\r
if (DataSizeFromFile1 == 1) {\r
DataFromFile1[InsertPosition1++] = OneByteFromFile1;\r
}\r
+\r
if (DataSizeFromFile2 == 1) {\r
DataFromFile2[InsertPosition2++] = OneByteFromFile2;\r
}\r
if (DataSizeFromFile1 == 1) {\r
DataFromFile1[InsertPosition1++] = OneByteFromFile1;\r
}\r
+\r
if (DataSizeFromFile2 == 1) {\r
DataFromFile2[InsertPosition2++] = OneByteFromFile2;\r
}\r
//\r
// ReadStatus should be always equal InDiffPoint.\r
//\r
- if ( InsertPosition1 == DifferentBytes ||\r
- InsertPosition2 == DifferentBytes ||\r
- (DataSizeFromFile1 == 0 && DataSizeFromFile2 == 0)\r
- ) {\r
-\r
+ if ((InsertPosition1 == DifferentBytes) ||\r
+ (InsertPosition2 == DifferentBytes) ||\r
+ ((DataSizeFromFile1 == 0) && (DataSizeFromFile2 == 0))\r
+ )\r
+ {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_COMP_DIFFERENCE_POINT), gShellDebug1HiiHandle, ++DiffPointNumber);\r
PrintDifferentPoint (FileName1, L"File1", DataFromFile1, InsertPosition1, DiffPointAddress, DifferentBytes);\r
PrintDifferentPoint (FileName2, L"File2", DataFromFile2, InsertPosition2, DiffPointAddress, DifferentBytes);\r
//\r
// One of two buffuers is empty, it means this is the last different point.\r
//\r
- if (InsertPosition1 == 0 || InsertPosition2 == 0) {\r
+ if ((InsertPosition1 == 0) || (InsertPosition2 == 0)) {\r
break;\r
}\r
\r
//\r
// Try to find a new different point in the rest of DataFromFile.\r
//\r
- for (; Index < MAX (InsertPosition1,InsertPosition2); Index++) {\r
+ for ( ; Index < MAX (InsertPosition1, InsertPosition2); Index++) {\r
if (DataFromFile1[Index] != DataFromFile2[Index]) {\r
- ReadStatus = InDiffPoint;\r
+ ReadStatus = InDiffPoint;\r
DiffPointAddress += Index;\r
break;\r
}\r
FileBufferUninit (&FileBuffer2);\r
\r
if (DiffPointNumber == 0) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_PASS), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_PASS), gShellDebug1HiiHandle);\r
} else {\r
ShellStatus = SHELL_NOT_EQUAL;\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_FAIL), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_FAIL), gShellDebug1HiiHandle);\r
}\r
}\r
}\r
\r
ShellCommandLineFreeVarList (Package);\r
}\r
- SHELL_FREE_NON_NULL(FileName1);\r
- SHELL_FREE_NON_NULL(FileName2);\r
+\r
+ SHELL_FREE_NON_NULL (FileName1);\r
+ SHELL_FREE_NON_NULL (FileName2);\r
\r
if (FileHandle1 != NULL) {\r
- gEfiShellProtocol->CloseFile(FileHandle1);\r
+ gEfiShellProtocol->CloseFile (FileHandle1);\r
}\r
+\r
if (FileHandle2 != NULL) {\r
- gEfiShellProtocol->CloseFile(FileHandle2);\r
+ gEfiShellProtocol->CloseFile (FileHandle2);\r
}\r
\r
return (ShellStatus);\r
projects / mirror_edk2.git / blobdiff