X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLib%2FUefiShellLib.c;h=c3a67c3be7685379c7a39d4f7120d0f9db7264cb;hb=5220897839dd583e9d1f749fb4d8196ff86ccc8b;hp=abff0d31149185c855c9e68c06083b764f289c80;hpb=1095b4323dab2e64e71bf7896ea88a0eb5d64706;p=mirror_edk2.git
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index abff0d3114..c3a67c3be7 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -1,8 +1,9 @@
/** @file
Provides interface to shell functionality for shell commands and applications.
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
Copyright 2016 Dell Inc.
- Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2017, 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
@@ -14,7 +15,6 @@
**/
#include "UefiShellLib.h"
-#include
#include
#include
@@ -36,6 +36,7 @@ EFI_SHELL_PROTOCOL *gEfiShellProtocol;
EFI_SHELL_PARAMETERS_PROTOCOL *gEfiShellParametersProtocol;
EFI_HANDLE mEfiShellEnvironment2Handle;
FILE_HANDLE_FUNCTION_MAP FileFunctionMap;
+EFI_UNICODE_COLLATION_PROTOCOL *mUnicodeCollationProtocol;
/**
Check if a Unicode character is a hexadecimal character.
@@ -90,7 +91,6 @@ ShellIsDecimalDigitCharacter (
@retval EFI_OUT_OF_RESOURCES Memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ShellFindSE2 (
IN EFI_HANDLE ImageHandle
)
@@ -174,7 +174,6 @@ ShellFindSE2 (
@retval EFI_SUCCESS The operationw as successful.
**/
EFI_STATUS
-EFIAPI
ShellLibConstructorWorker (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
@@ -295,6 +294,7 @@ ShellLibConstructor (
gEfiShellParametersProtocol = NULL;
mEfiShellInterface = NULL;
mEfiShellEnvironment2Handle = NULL;
+ mUnicodeCollationProtocol = NULL;
//
// verify that auto initialize is not set false
@@ -373,6 +373,8 @@ EFIAPI
ShellInitialize (
)
{
+ EFI_STATUS Status;
+
//
// if auto initialize is not false then skip
//
@@ -383,7 +385,8 @@ ShellInitialize (
//
// deinit the current stuff
//
- ASSERT_EFI_ERROR(ShellLibDestructor(gImageHandle, gST));
+ Status = ShellLibDestructor (gImageHandle, gST);
+ ASSERT_EFI_ERROR (Status);
//
// init the new stuff
@@ -699,7 +702,7 @@ ShellOpenFileByName(
// Create the directory to create the file in
//
FileNameCopy = AllocateCopyPool (StrSize (FileName), FileName);
- if (FileName == NULL) {
+ if (FileNameCopy == NULL) {
return (EFI_OUT_OF_RESOURCES);
}
PathCleanUpDirectories (FileNameCopy);
@@ -717,7 +720,21 @@ ShellOpenFileByName(
Status = gEfiShellProtocol->OpenFileByName(FileName,
FileHandle,
OpenMode);
- if (StrCmp(FileName, L"NUL") != 0 && !EFI_ERROR(Status) && ((OpenMode & EFI_FILE_MODE_CREATE) != 0)){
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
+ if (mUnicodeCollationProtocol == NULL) {
+ Status = gBS->LocateProtocol (&gEfiUnicodeCollation2ProtocolGuid, NULL, (VOID**)&mUnicodeCollationProtocol);
+ if (EFI_ERROR (Status)) {
+ gEfiShellProtocol->CloseFile (*FileHandle);
+ return Status;
+ }
+ }
+
+ if ((mUnicodeCollationProtocol->StriColl (mUnicodeCollationProtocol, (CHAR16*)FileName, L"NUL") != 0) &&
+ (mUnicodeCollationProtocol->StriColl (mUnicodeCollationProtocol, (CHAR16*)FileName, L"NULL") != 0) &&
+ !EFI_ERROR(Status) && ((OpenMode & EFI_FILE_MODE_CREATE) != 0)){
FileInfo = FileFunctionMap.GetFileInfo(*FileHandle);
ASSERT(FileInfo != NULL);
FileInfo->Attribute = Attributes;
@@ -1403,7 +1420,6 @@ typedef struct {
@retval the resultant head of the double linked new format list;
**/
LIST_ENTRY*
-EFIAPI
InternalShellConvertFileListType (
IN LIST_ENTRY *FileList,
IN OUT LIST_ENTRY *ListHead
@@ -1873,7 +1889,6 @@ typedef struct {
@retval FALSE the Parameter was not found. Type is not valid.
**/
BOOLEAN
-EFIAPI
InternalIsOnCheckList (
IN CONST CHAR16 *Name,
IN CONST SHELL_PARAM_ITEM *CheckList,
@@ -1942,7 +1957,6 @@ InternalIsOnCheckList (
@retval FALSE the Parameter not a flag.
**/
BOOLEAN
-EFIAPI
InternalIsFlag (
IN CONST CHAR16 *Name,
IN CONST BOOLEAN AlwaysAllowNumbers,
@@ -1999,7 +2013,6 @@ InternalIsFlag (
ProblemParam if provided.
**/
EFI_STATUS
-EFIAPI
InternalCommandLineParse (
IN CONST SHELL_PARAM_ITEM *CheckList,
OUT LIST_ENTRY **CheckPackage,
@@ -2018,6 +2031,7 @@ InternalCommandLineParse (
UINTN Count;
CONST CHAR16 *TempPointer;
UINTN CurrentValueSize;
+ CHAR16 *NewValue;
CurrentItemPackage = NULL;
GetItemValue = 0;
@@ -2116,8 +2130,15 @@ InternalCommandLineParse (
// get the item VALUE for a previous flag
//
CurrentValueSize = ValueSize + StrSize(Argv[LoopCounter]) + sizeof(CHAR16);
- CurrentItemPackage->Value = ReallocatePool(ValueSize, CurrentValueSize, CurrentItemPackage->Value);
- ASSERT(CurrentItemPackage->Value != NULL);
+ NewValue = ReallocatePool(ValueSize, CurrentValueSize, CurrentItemPackage->Value);
+ if (NewValue == NULL) {
+ SHELL_FREE_NON_NULL (CurrentItemPackage->Value);
+ SHELL_FREE_NON_NULL (CurrentItemPackage);
+ ShellCommandLineFreeVarList (*CheckPackage);
+ *CheckPackage = NULL;
+ return EFI_OUT_OF_RESOURCES;
+ }
+ CurrentItemPackage->Value = NewValue;
if (ValueSize == 0) {
StrCpyS( CurrentItemPackage->Value,
CurrentValueSize/sizeof(CHAR16),
@@ -2680,7 +2701,6 @@ ShellCopySearchAndReplace(
@retval !EFI_SUCCESS The operation failed.
**/
EFI_STATUS
-EFIAPI
InternalPrintTo (
IN CONST CHAR16 *String
)
@@ -2736,7 +2756,6 @@ InternalPrintTo (
@return EFI_DEVICE_ERROR The console device reported an error.
**/
EFI_STATUS
-EFIAPI
InternalShellPrintWorker(
IN INT32 Col OPTIONAL,
IN INT32 Row OPTIONAL,
@@ -2809,7 +2828,7 @@ InternalShellPrintWorker(
// update the attribute
//
if (ResumeLocation != NULL) {
- if (*(ResumeLocation-1) == L'^') {
+ if ((ResumeLocation != mPostReplaceFormat2) && (*(ResumeLocation-1) == L'^')) {
//
// Move cursor back 1 position to overwrite the ^
//
@@ -2965,13 +2984,14 @@ ShellPrintHiiEx(
CHAR16 *HiiFormatString;
EFI_STATUS RetVal;
+ RetVal = EFI_DEVICE_ERROR;
+
VA_START (Marker, HiiFormatHandle);
HiiFormatString = HiiGetString(HiiFormatHandle, HiiFormatStringId, Language);
- ASSERT(HiiFormatString != NULL);
-
- RetVal = InternalShellPrintWorker(Col, Row, HiiFormatString, Marker);
-
- SHELL_FREE_NON_NULL(HiiFormatString);
+ if (HiiFormatString != NULL) {
+ RetVal = InternalShellPrintWorker (Col, Row, HiiFormatString, Marker);
+ SHELL_FREE_NON_NULL (HiiFormatString);
+ }
VA_END(Marker);
return (RetVal);
@@ -3283,7 +3303,7 @@ StrnCatGrow (
Prompt the user and return the resultant answer to the requestor.
This function will display the requested question on the shell prompt and then
- wait for an apropriate answer to be input from the console.
+ wait for an appropriate answer to be input from the console.
if the SHELL_PROMPT_REQUEST_TYPE is SHELL_PROMPT_REQUEST_TYPE_YESNO, ShellPromptResponseTypeQuitContinue
or SHELL_PROMPT_REQUEST_TYPE_YESNOCANCEL then *Response is of type SHELL_PROMPT_RESPONSE.
@@ -3383,7 +3403,8 @@ ShellPromptForResponse (
break;
}
}
- break; case ShellPromptResponseTypeYesNoAllCancel:
+ break;
+ case ShellPromptResponseTypeYesNoAllCancel:
if (Prompt != NULL) {
ShellPrintEx(-1, -1, L"%s", Prompt);
}
@@ -3401,7 +3422,11 @@ ShellPromptForResponse (
if (EFI_ERROR(Status)) {
break;
}
- ShellPrintEx(-1, -1, L"%c", Key.UnicodeChar);
+
+ if (Key.UnicodeChar <= 127 && Key.UnicodeChar >= 32) {
+ ShellPrintEx (-1, -1, L"%c", Key.UnicodeChar);
+ }
+
switch (Key.UnicodeChar) {
case L'Y':
case L'y':
@@ -3585,7 +3610,6 @@ ShellPromptForResponseHii (
@retval FALSE There is a non-numeric character.
**/
BOOLEAN
-EFIAPI
InternalShellIsHexOrDecimalNumber (
IN CONST CHAR16 *String,
IN CONST BOOLEAN ForceHex,
@@ -3698,7 +3722,6 @@ ShellFileExists(
**/
CHAR16
-EFIAPI
InternalShellCharToUpper (
IN CHAR16 Char
)
@@ -3724,7 +3747,6 @@ InternalShellCharToUpper (
**/
UINTN
-EFIAPI
InternalShellHexCharToUintn (
IN CHAR16 Char
)
@@ -3733,7 +3755,7 @@ InternalShellHexCharToUintn (
return Char - L'0';
}
- return (UINTN) (10 + InternalShellCharToUpper (Char) - L'A');
+ return (10 + InternalShellCharToUpper (Char) - L'A');
}
/**
@@ -3767,7 +3789,6 @@ InternalShellHexCharToUintn (
@retval EFI_DEVICE_ERROR An overflow occured.
**/
EFI_STATUS
-EFIAPI
InternalShellStrHexToUint64 (
IN CONST CHAR16 *String,
OUT UINT64 *Value,
@@ -3869,7 +3890,6 @@ InternalShellStrHexToUint64 (
@retval EFI_DEVICE_ERROR An overflow occured.
**/
EFI_STATUS
-EFIAPI
InternalShellStrDecimalToUint64 (
IN CONST CHAR16 *String,
OUT UINT64 *Value,
@@ -4071,6 +4091,9 @@ ShellFileHandleReturnLine(
Status = ShellFileHandleReadLine(Handle, RetVal, &Size, FALSE, Ascii);
}
+ if (Status == EFI_END_OF_FILE && RetVal != NULL && *RetVal != CHAR_NULL) {
+ Status = EFI_SUCCESS;
+ }
if (EFI_ERROR(Status) && (RetVal != NULL)) {
FreePool(RetVal);
RetVal = NULL;
@@ -4318,7 +4341,6 @@ ShellDeleteFileByName(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
InternalShellStripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString