X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDebug1CommandsLib%2FUefiShellDebug1CommandsLib.c;h=ddce3bef5a3022cf4c9461df19ac517bad52e0b3;hb=56ba37463a5ffa44df1c5741184ba0594fadbeba;hp=9ab5d89748a82bd62aea26a355fa8fc2b40f39cd;hpb=bca163ff11c38b5495f9b71f5dd3638e510f1890;p=mirror_edk2.git diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c index 9ab5d89748..ddce3bef5a 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c @@ -1,18 +1,13 @@ /** @file Main file for NULL named library for debug1 profile shell command functions. - Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include "UefiShellDebug1CommandsLib.h" +#include STATIC CONST CHAR16 mFileName[] = L"Debug1Commands"; EFI_HANDLE gShellDebug1HiiHandle = NULL; @@ -84,18 +79,10 @@ UefiShellDebug1CommandsLibConstructor ( ShellCommandRegisterCommandName(L"edit", ShellCommandRunEdit , ShellCommandGetManFileNameDebug1, 0, L"Debug1", TRUE, gShellDebug1HiiHandle, STRING_TOKEN(STR_GET_HELP_EDIT) ); ShellCommandRegisterCommandName(L"hexedit", ShellCommandRunHexEdit , ShellCommandGetManFileNameDebug1, 0, L"Debug1", TRUE, gShellDebug1HiiHandle, STRING_TOKEN(STR_GET_HELP_HEXEDIT) ); - // - // check install profile bit of the profiles mask is set - // - if ((PcdGet8(PcdShellProfileMask) & BIT2) == 0) { - ShellCommandRegisterCommandName(L"bcfg", ShellCommandRunBcfg , ShellCommandGetManFileNameDebug1, 0, L"Debug1", TRUE, gShellDebug1HiiHandle, STRING_TOKEN(STR_GET_HELP_BCFG) ); - } - - - - ShellCommandRegisterAlias(L"dmem", L"mem"); + BcfgLibraryRegisterBcfgCommand(ImageHandle, SystemTable, L"Debug1"); + return (EFI_SUCCESS); } @@ -115,108 +102,11 @@ UefiShellDebug1CommandsLibDestructor ( if (gShellDebug1HiiHandle != NULL) { HiiRemovePackages(gShellDebug1HiiHandle); } - return (EFI_SUCCESS); -} - -STATIC CONST CHAR8 Hex[] = { - '0', - '1', - '2', - '3', - '4', - '5', - '6', - '7', - '8', - '9', - 'A', - 'B', - 'C', - 'D', - 'E', - 'F' -}; - -/** - Dump some hexadecimal data to the screen. - - @param[in] Indent How many spaces to indent the output. - @param[in] Offset The offset of the printing. - @param[in] DataSize The size in bytes of UserData. - @param[in] UserData The data to print out. -**/ -VOID -DumpHex ( - IN UINTN Indent, - IN UINTN Offset, - IN UINTN DataSize, - IN VOID *UserData - ) -{ - UINT8 *Data; - - CHAR8 Val[50]; - - CHAR8 Str[20]; - - UINT8 TempByte; - UINTN Size; - UINTN Index; - Data = UserData; - while (DataSize != 0) { - Size = 16; - if (Size > DataSize) { - Size = DataSize; - } - - for (Index = 0; Index < Size; Index += 1) { - TempByte = Data[Index]; - Val[Index * 3 + 0] = Hex[TempByte >> 4]; - Val[Index * 3 + 1] = Hex[TempByte & 0xF]; - Val[Index * 3 + 2] = (CHAR8) ((Index == 7) ? '-' : ' '); - Str[Index] = (CHAR8) ((TempByte < ' ' || TempByte > 'z') ? '.' : TempByte); - } - - Val[Index * 3] = 0; - Str[Index] = 0; - ShellPrintEx(-1, -1, L"%*a%02X: %-.48a *%a*\r\n", Indent, "", Offset, Val, Str); - - Data += Size; - Offset += Size; - DataSize -= Size; - } + BcfgLibraryUnregisterBcfgCommand(ImageHandle, SystemTable); + return (EFI_SUCCESS); } -/** - Convert a Unicode character to upper case only if - it maps to a valid small-case ASCII character. - - This internal function only deal with Unicode character - which maps to a valid small-case ASCII character, i.e. - L'a' to L'z'. For other Unicode character, the input character - is returned directly. - - @param Char The character to convert. - - @retval LowerCharacter If the Char is with range L'a' to L'z'. - @retval Unchanged Otherwise. - - - //Stolen from MdePkg Baselib -**/ -CHAR16 -EFIAPI -CharToUpper ( - IN CHAR16 Char - ) -{ - if (Char >= L'a' && Char <= L'z') { - return (CHAR16) (Char - (L'a' - L'A')); - } - - return Char; -} /** Function returns a system configuration table that is stored in the @@ -229,7 +119,6 @@ CharToUpper ( @retval EFI_NOT_FOUND A configuration table matching TableGuid was not found. **/ EFI_STATUS -EFIAPI GetSystemConfigurationTable ( IN EFI_GUID *TableGuid, IN OUT VOID **Table @@ -248,137 +137,21 @@ GetSystemConfigurationTable ( return EFI_NOT_FOUND; } -/** - Convert a Unicode character to numerical value. - - This internal function only deal with Unicode character - which maps to a valid hexadecimal ASII character, i.e. - L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other - Unicode character, the value returned does not make sense. - - @param Char The character to convert. - - @return The numerical value converted. - -**/ -UINTN -EFIAPI -HexCharToUintn ( - IN CHAR16 Char - ) -{ - if (Char >= L'0' && Char <= L'9') { - return Char - L'0'; - } - - return (UINTN) (10 + CharToUpper (Char) - L'A'); -} - -/** - Convert a string representation of a guid to a Guid value. - - @param[in] StringGuid The pointer to the string of a guid. - @param[in, out] Guid The pointer to the GUID structure to populate. - - @retval EFI_INVALID_PARAMETER A parameter was invalid. - @retval EFI_SUCCESS The conversion was successful. -**/ -EFI_STATUS -EFIAPI -ConvertStringToGuid ( - IN CONST CHAR16 *StringGuid, - IN OUT EFI_GUID *Guid - ) -{ - CHAR16 *TempCopy; - CHAR16 *TempSpot; - CHAR16 *Walker; - UINT64 TempVal; - EFI_STATUS Status; - - if (StringGuid == NULL) { - return (EFI_INVALID_PARAMETER); - } else if (StrLen(StringGuid) != 36) { - return (EFI_INVALID_PARAMETER); - } - TempCopy = NULL; - TempCopy = StrnCatGrow(&TempCopy, NULL, StringGuid, 0); - Walker = TempCopy; - TempSpot = StrStr(Walker, L"-"); - if (TempSpot != NULL) { - *TempSpot = CHAR_NULL; - } - Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE); - if (EFI_ERROR(Status)) { - FreePool(TempCopy); - return (Status); - } - Guid->Data1 = (UINT32)TempVal; - Walker += 9; - TempSpot = StrStr(Walker, L"-"); - if (TempSpot != NULL) { - *TempSpot = CHAR_NULL; - } - Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE); - if (EFI_ERROR(Status)) { - FreePool(TempCopy); - return (Status); - } - Guid->Data2 = (UINT16)TempVal; - Walker += 5; - TempSpot = StrStr(Walker, L"-"); - if (TempSpot != NULL) { - *TempSpot = CHAR_NULL; - } - Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE); - if (EFI_ERROR(Status)) { - FreePool(TempCopy); - return (Status); - } - Guid->Data3 = (UINT16)TempVal; - Walker += 5; - Guid->Data4[0] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[0] = (UINT8)(Guid->Data4[0]+ (UINT8)HexCharToUintn(Walker[1])); - Walker += 2; - Guid->Data4[1] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[1] = (UINT8)(Guid->Data4[1] + (UINT8)HexCharToUintn(Walker[1])); - Walker += 3; - Guid->Data4[2] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[2] = (UINT8)(Guid->Data4[2] + (UINT8)HexCharToUintn(Walker[1])); - Walker += 2; - Guid->Data4[3] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[3] = (UINT8)(Guid->Data4[3] + (UINT8)HexCharToUintn(Walker[1])); - Walker += 2; - Guid->Data4[4] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[4] = (UINT8)(Guid->Data4[4] + (UINT8)HexCharToUintn(Walker[1])); - Walker += 2; - Guid->Data4[5] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[5] = (UINT8)(Guid->Data4[5] + (UINT8)HexCharToUintn(Walker[1])); - Walker += 2; - Guid->Data4[6] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[6] = (UINT8)(Guid->Data4[6] + (UINT8)HexCharToUintn(Walker[1])); - Walker += 2; - Guid->Data4[7] = (UINT8)(HexCharToUintn(Walker[0]) * 16); - Guid->Data4[7] = (UINT8)(Guid->Data4[7] + (UINT8)HexCharToUintn(Walker[1])); - FreePool(TempCopy); - return (EFI_SUCCESS); -} - /** Clear the line at the specified Row. - + @param[in] Row The row number to be cleared ( start from 1 ) @param[in] LastCol The last printable column. @param[in] LastRow The last printable row. **/ VOID -EFIAPI EditorClearLine ( IN UINTN Row, IN UINTN LastCol, IN UINTN LastRow ) { + UINTN Col; CHAR16 Line[200]; if (Row == 0) { @@ -387,22 +160,28 @@ EditorClearLine ( // // prepare a blank line + // If max column is larger, split to multiple prints. // - SetMem16(Line, LastCol*sizeof(CHAR16), L' '); + SetMem16 (Line, sizeof (Line), L' '); + Line[ARRAY_SIZE (Line) - 1] = CHAR_NULL; + + for (Col = 1; Col <= LastCol; Col += ARRAY_SIZE (Line) - 1) { + if (Col + ARRAY_SIZE (Line) - 1 > LastCol) { + if (Row == LastRow) { + // + // if CHAR_NULL is still at position LastCol, it will cause first line error + // + Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL; + } else { + Line[LastCol % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL; + } + } - if (Row == LastRow) { // - // if CHAR_NULL is still at position 80, it will cause first line error + // print out the blank line // - Line[LastCol - 1] = CHAR_NULL; - } else { - Line[LastCol] = CHAR_NULL; + ShellPrintEx ((INT32) Col - 1, (INT32) Row - 1, Line); } - - // - // print out the blank line - // - ShellPrintEx (0, ((INT32)Row) - 1, Line); } /** @@ -414,7 +193,6 @@ EditorClearLine ( @retval FALSE The character is not valid. **/ BOOLEAN -EFIAPI IsValidFileNameChar ( IN CONST CHAR16 Ch ) @@ -422,7 +200,7 @@ IsValidFileNameChar ( // // See if there are any illegal characters within the name // - if (Ch < 0x20 || Ch == L'\"' || Ch == L'*' || Ch == L'/' || Ch == L'<' || Ch == L'>' || Ch == L'?' || Ch == L'|' || Ch == L' ') { + if (Ch < 0x20 || Ch == L'\"' || Ch == L'*' || Ch == L'/' || Ch == L'<' || Ch == L'>' || Ch == L'?' || Ch == L'|') { return FALSE; } @@ -431,14 +209,13 @@ IsValidFileNameChar ( /** Check if file name has illegal characters. - + @param Name The filename to check. @retval TRUE The filename is ok. @retval FALSE The filename is not ok. **/ BOOLEAN -EFIAPI IsValidFileName ( IN CONST CHAR16 *Name ) @@ -480,18 +257,15 @@ IsValidFileName ( @return the valid filename. **/ CHAR16 * -EFIAPI EditGetDefaultFileName ( IN CONST CHAR16 *Extension ) { EFI_STATUS Status; UINTN Suffix; - BOOLEAN FoundNewFile; CHAR16 *FileNameTmp; Suffix = 0; - FoundNewFile = FALSE; do { FileNameTmp = CatSPrint (NULL, L"NewFile%d.%s", Suffix, Extension); @@ -515,18 +289,18 @@ EditGetDefaultFileName ( } /** - Read a file into an allocated buffer. The buffer is the responsibility + Read a file into an allocated buffer. The buffer is the responsibility of the caller to free. @param[in] FileName The filename of the file to open. - @param[out] Buffer Upon successful return, the pointer to the - address of the allocated buffer. + @param[out] Buffer Upon successful return, the pointer to the + address of the allocated buffer. @param[out] BufferSize If not NULL, then the pointer to the size of the allocated buffer. @param[out] ReadOnly Upon successful return TRUE if the file is read only. FALSE otherwise. - @retval EFI_NOT_FOUND The filename did not represent a file in the + @retval EFI_NOT_FOUND The filename did not represent a file in the file system. @retval EFI_SUCCESS The file was read into the buffer. @retval EFI_OUT_OF_RESOURCES A memory allocation failed. @@ -536,7 +310,6 @@ EditGetDefaultFileName ( @retval EFI_INVALID_PARAMETER FileName was a directory. **/ EFI_STATUS -EFIAPI ReadFileIntoBuffer ( IN CONST CHAR16 *FileName, OUT VOID **Buffer, @@ -574,7 +347,7 @@ ReadFileIntoBuffer ( } Info = ShellGetFileInfo(FileHandle); - + if (Info->Attribute & EFI_FILE_DIRECTORY) { FreePool (Info); return EFI_INVALID_PARAMETER;