//\r
// Global Variables\r
//\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-f", TypeFlag},\r
- {L"-d", TypeFlag},\r
- {L"-m", TypeFlag},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-f", TypeFlag },\r
+ { L"-d", TypeFlag },\r
+ { L"-m", TypeFlag },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
Function for 'hexedit' command.\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- CHAR16 *Buffer;\r
- CHAR16 *ProblemParam;\r
- SHELL_STATUS ShellStatus;\r
- LIST_ENTRY *Package;\r
- CHAR16 *NewName;\r
- CONST CHAR16 *Name;\r
- UINTN Offset;\r
- UINTN Size;\r
- EDIT_FILE_TYPE WhatToDo;\r
+ EFI_STATUS Status;\r
+ CHAR16 *Buffer;\r
+ CHAR16 *ProblemParam;\r
+ SHELL_STATUS ShellStatus;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *NewName;\r
+ CONST CHAR16 *Name;\r
+ UINTN Offset;\r
+ UINTN Size;\r
+ EDIT_FILE_TYPE WhatToDo;\r
\r
Buffer = NULL;\r
ShellStatus = SHELL_SUCCESS;\r
- NewName = NULL;\r
+ NewName = NULL;\r
Buffer = NULL;\r
Name = NULL;\r
Offset = 0;\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"hexedit", 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"hexedit", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
//\r
// Check for -d\r
//\r
- if (ShellCommandLineGetFlag(Package, L"-d")){\r
- if (ShellCommandLineGetCount(Package) < 4) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
+ if (ShellCommandLineGetFlag (Package, L"-d")) {\r
+ if (ShellCommandLineGetCount (Package) < 4) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (ShellCommandLineGetCount(Package) > 4) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
+ } else if (ShellCommandLineGetCount (Package) > 4) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
WhatToDo = FileTypeDiskBuffer;\r
- Name = ShellCommandLineGetRawValue(Package, 1);\r
- Offset = ShellStrToUintn(ShellCommandLineGetRawValue(Package, 2));\r
- Size = ShellStrToUintn(ShellCommandLineGetRawValue(Package, 3));\r
+ Name = ShellCommandLineGetRawValue (Package, 1);\r
+ Offset = ShellStrToUintn (ShellCommandLineGetRawValue (Package, 2));\r
+ Size = ShellStrToUintn (ShellCommandLineGetRawValue (Package, 3));\r
}\r
- if (Offset == (UINTN)-1 || Size == (UINTN)-1) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDebug1HiiHandle, L"hexedit", L"-d");\r
+\r
+ if ((Offset == (UINTN)-1) || (Size == (UINTN)-1)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDebug1HiiHandle, L"hexedit", L"-d");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
//\r
// check for -f\r
//\r
- if (ShellCommandLineGetFlag(Package, L"-f") && (WhatToDo == FileTypeNone)){\r
- if (ShellCommandLineGetCount(Package) < 2) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
+ if (ShellCommandLineGetFlag (Package, L"-f") && (WhatToDo == FileTypeNone)) {\r
+ if (ShellCommandLineGetCount (Package) < 2) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (ShellCommandLineGetCount(Package) > 2) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
+ } else if (ShellCommandLineGetCount (Package) > 2) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- Name = ShellCommandLineGetRawValue(Package, 1);\r
- if (Name == NULL || !IsValidFileName(Name)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"hexedit", Name);\r
+ Name = ShellCommandLineGetRawValue (Package, 1);\r
+ if ((Name == NULL) || !IsValidFileName (Name)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"hexedit", Name);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- WhatToDo = FileTypeFileBuffer;\r
+ WhatToDo = FileTypeFileBuffer;\r
}\r
}\r
}\r
//\r
// check for -m\r
//\r
- if (ShellCommandLineGetFlag(Package, L"-m") && (WhatToDo == FileTypeNone)){\r
- if (ShellCommandLineGetCount(Package) < 3) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
+ if (ShellCommandLineGetFlag (Package, L"-m") && (WhatToDo == FileTypeNone)) {\r
+ if (ShellCommandLineGetCount (Package) < 3) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (ShellCommandLineGetCount(Package) > 3) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
+ } else if (ShellCommandLineGetCount (Package) > 3) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
WhatToDo = FileTypeMemBuffer;\r
- Offset = ShellStrToUintn(ShellCommandLineGetRawValue(Package, 1));\r
- Size = ShellStrToUintn(ShellCommandLineGetRawValue(Package, 2));\r
+ Offset = ShellStrToUintn (ShellCommandLineGetRawValue (Package, 1));\r
+ Size = ShellStrToUintn (ShellCommandLineGetRawValue (Package, 2));\r
}\r
}\r
- Name = ShellCommandLineGetRawValue(Package, 1);\r
- if (WhatToDo == FileTypeNone && Name != NULL) {\r
- if (ShellCommandLineGetCount(Package) > 2) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
+\r
+ Name = ShellCommandLineGetRawValue (Package, 1);\r
+ if ((WhatToDo == FileTypeNone) && (Name != NULL)) {\r
+ if (ShellCommandLineGetCount (Package) > 2) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (!IsValidFileName(Name)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"hexedit", Name);\r
+ } else if (!IsValidFileName (Name)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"hexedit", Name);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- WhatToDo = FileTypeFileBuffer;\r
+ WhatToDo = FileTypeFileBuffer;\r
}\r
} else if (WhatToDo == FileTypeNone) {\r
- if (gEfiShellProtocol->GetCurDir(NULL) == NULL) {\r
+ if (gEfiShellProtocol->GetCurDir (NULL) == NULL) {\r
ShellStatus = SHELL_NOT_FOUND;\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle, L"hexedit");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle, L"hexedit");\r
} else {\r
- NewName = EditGetDefaultFileName(L"bin");\r
- Name = NewName;\r
- WhatToDo = FileTypeFileBuffer;\r
+ NewName = EditGetDefaultFileName (L"bin");\r
+ Name = NewName;\r
+ WhatToDo = FileTypeFileBuffer;\r
}\r
}\r
\r
- if (ShellStatus == SHELL_SUCCESS && WhatToDo == FileTypeNone) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
+ if ((ShellStatus == SHELL_SUCCESS) && (WhatToDo == FileTypeNone)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (WhatToDo == FileTypeFileBuffer && ShellGetCurrentDir(NULL) == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle, L"hexedit");\r
+ } else if ((WhatToDo == FileTypeFileBuffer) && (ShellGetCurrentDir (NULL) == NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle, L"hexedit");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
gST->ConOut->ClearScreen (gST->ConOut);\r
gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gShellDebug1HiiHandle);\r
} else {\r
HMainEditorBackup ();\r
switch (WhatToDo) {\r
- case FileTypeFileBuffer:\r
- Status = HBufferImageRead (\r
- Name==NULL?L"":Name,\r
- NULL,\r
- 0,\r
- 0,\r
- 0,\r
- 0,\r
- FileTypeFileBuffer,\r
- FALSE\r
- );\r
- break;\r
+ case FileTypeFileBuffer:\r
+ Status = HBufferImageRead (\r
+ Name == NULL ? L"" : Name,\r
+ NULL,\r
+ 0,\r
+ 0,\r
+ 0,\r
+ 0,\r
+ FileTypeFileBuffer,\r
+ FALSE\r
+ );\r
+ break;\r
\r
- case FileTypeDiskBuffer:\r
- Status = HBufferImageRead (\r
- NULL,\r
- Name==NULL?L"":Name,\r
- Offset,\r
- Size,\r
- 0,\r
- 0,\r
- FileTypeDiskBuffer,\r
- FALSE\r
- );\r
- break;\r
+ case FileTypeDiskBuffer:\r
+ Status = HBufferImageRead (\r
+ NULL,\r
+ Name == NULL ? L"" : Name,\r
+ Offset,\r
+ Size,\r
+ 0,\r
+ 0,\r
+ FileTypeDiskBuffer,\r
+ FALSE\r
+ );\r
+ break;\r
\r
- case FileTypeMemBuffer:\r
- Status = HBufferImageRead (\r
- NULL,\r
- NULL,\r
- 0,\r
- 0,\r
- (UINT32) Offset,\r
- Size,\r
- FileTypeMemBuffer,\r
- FALSE\r
- );\r
- break;\r
+ case FileTypeMemBuffer:\r
+ Status = HBufferImageRead (\r
+ NULL,\r
+ NULL,\r
+ 0,\r
+ 0,\r
+ (UINT32)Offset,\r
+ Size,\r
+ FileTypeMemBuffer,\r
+ FALSE\r
+ );\r
+ break;\r
\r
- default:\r
- Status = EFI_NOT_FOUND;\r
- break;\r
+ default:\r
+ Status = EFI_NOT_FOUND;\r
+ break;\r
}\r
+\r
if (!EFI_ERROR (Status)) {\r
HMainEditorRefresh ();\r
Status = HMainEditorKeyInput ();\r
}\r
+\r
if (Status != EFI_OUT_OF_RESOURCES) {\r
//\r
// back up the status string\r
//\r
- Buffer = CatSPrint (NULL, L"%s\r\n", StatusBarGetString());\r
+ Buffer = CatSPrint (NULL, L"%s\r\n", StatusBarGetString ());\r
}\r
}\r
\r
// print editor exit code on screen\r
//\r
if (Status == EFI_OUT_OF_RESOURCES) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellDebug1HiiHandle, L"hexedit");\r
- } else if (EFI_ERROR(Status)){\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellDebug1HiiHandle, L"hexedit");\r
+ } else if (EFI_ERROR (Status)) {\r
if (Buffer != NULL) {\r
if (StrCmp (Buffer, L"") != 0) {\r
//\r
// print out the status string\r
//\r
- ShellPrintEx(-1, -1, L"%s", Buffer);\r
+ ShellPrintEx (-1, -1, L"%s", Buffer);\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gShellDebug1HiiHandle);\r
}\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gShellDebug1HiiHandle);\r
}\r
}\r
}\r
+\r
ShellCommandLineFreeVarList (Package);\r
}\r
\r
projects / mirror_edk2.git / blobdiff