X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FApplication%2FCapsuleApp%2FAppSupport.c;h=a727dbdc66b772d07b18ed3d6791870b4962c201;hp=6aea76a7201d8c4e2fadf8b6d6409526c15b6014;hb=8f7a05e1396657c8bd2948825f41d0fdf239e334;hpb=1e09ec094637391879850a7db3b2ff59df2dd1ed
diff --git a/MdeModulePkg/Application/CapsuleApp/AppSupport.c b/MdeModulePkg/Application/CapsuleApp/AppSupport.c
index 6aea76a720..a727dbdc66 100644
--- a/MdeModulePkg/Application/CapsuleApp/AppSupport.c
+++ b/MdeModulePkg/Application/CapsuleApp/AppSupport.c
@@ -1,7 +1,7 @@
/** @file
A shell application that triggers capsule update process.
- Copyright (c) 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 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
@@ -18,22 +18,14 @@
#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
+#include
#include
-#include
-
-#define IS_HYPHEN(a) ((a) == L'-')
-#define IS_NULL(a) ((a) == L'\0')
-
-#define MAX_ARG_NUM 11
UINTN Argc;
CHAR16 **Argv;
+EFI_SHELL_PROTOCOL *mShellProtocol = NULL;
/**
@@ -64,435 +56,109 @@ GetArg (
}
/**
- Converts a list of string to a specified buffer.
-
- @param[out] Buf The output buffer that contains the string.
- @param[in] BufferLength The length of the buffer
- @param[in] Str The input string that contains the hex number
-
- @retval EFI_SUCCESS The string was successfully converted to the buffer.
-
-**/
-EFI_STATUS
-StrToBuf (
- OUT UINT8 *Buf,
- IN UINTN BufferLength,
- IN CHAR16 *Str
- )
-{
- UINTN Index;
- UINTN StrLength;
- UINT8 Digit;
- UINT8 Byte;
-
- Digit = 0;
-
- //
- // Two hex char make up one byte
- //
- StrLength = BufferLength * sizeof (CHAR16);
-
- for(Index = 0; Index < StrLength; Index++, Str++) {
-
- if ((*Str >= L'a') && (*Str <= L'f')) {
- Digit = (UINT8) (*Str - L'a' + 0x0A);
- } else if ((*Str >= L'A') && (*Str <= L'F')) {
- Digit = (UINT8) (*Str - L'A' + 0x0A);
- } else if ((*Str >= L'0') && (*Str <= L'9')) {
- Digit = (UINT8) (*Str - L'0');
- } else {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // For odd characters, write the upper nibble for each buffer byte,
- // and for even characters, the lower nibble.
- //
- if ((Index & 1) == 0) {
- Byte = (UINT8) (Digit << 4);
- } else {
- Byte = Buf[Index / 2];
- Byte &= 0xF0;
- Byte = (UINT8) (Byte | Digit);
- }
-
- Buf[Index / 2] = Byte;
- }
-
- return EFI_SUCCESS;
-}
-
-/**
- Converts a string to GUID value.
- Guid Format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-
- @param[in] Str The registry format GUID string that contains the GUID value.
- @param[out] Guid A pointer to the converted GUID value.
-
- @retval EFI_SUCCESS The GUID string was successfully converted to the GUID value.
- @retval EFI_UNSUPPORTED The input string is not in registry format.
- @return others Some error occurred when converting part of GUID value.
-
-**/
-EFI_STATUS
-StrToGuid (
- IN CHAR16 *Str,
- OUT EFI_GUID *Guid
- )
-{
- //
- // Get the first UINT32 data
- //
- Guid->Data1 = (UINT32) StrHexToUint64 (Str);
- while (!IS_HYPHEN (*Str) && !IS_NULL (*Str)) {
- Str ++;
- }
-
- if (IS_HYPHEN (*Str)) {
- Str++;
- } else {
- return EFI_UNSUPPORTED;
- }
-
- //
- // Get the second UINT16 data
- //
- Guid->Data2 = (UINT16) StrHexToUint64 (Str);
- while (!IS_HYPHEN (*Str) && !IS_NULL (*Str)) {
- Str ++;
- }
-
- if (IS_HYPHEN (*Str)) {
- Str++;
- } else {
- return EFI_UNSUPPORTED;
- }
-
- //
- // Get the third UINT16 data
- //
- Guid->Data3 = (UINT16) StrHexToUint64 (Str);
- while (!IS_HYPHEN (*Str) && !IS_NULL (*Str)) {
- Str ++;
- }
-
- if (IS_HYPHEN (*Str)) {
- Str++;
- } else {
- return EFI_UNSUPPORTED;
- }
-
- //
- // Get the following 8 bytes data
- //
- StrToBuf (&Guid->Data4[0], 2, Str);
- //
- // Skip 2 byte hex chars
- //
- Str += 2 * 2;
-
- if (IS_HYPHEN (*Str)) {
- Str++;
- } else {
- return EFI_UNSUPPORTED;
- }
- StrToBuf (&Guid->Data4[2], 6, Str);
-
- return EFI_SUCCESS;
-}
-
-/**
- Return File System Volume containing this shell application.
+ Get shell protocol.
- @return File System Volume containing this shell application.
+ @return Pointer to shell protocol.
**/
-EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *
-GetMyVol (
+EFI_SHELL_PROTOCOL *
+GetShellProtocol (
VOID
)
{
- EFI_STATUS Status;
- EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Vol;
+ EFI_STATUS Status;
- Status = gBS->HandleProtocol (
- gImageHandle,
- &gEfiLoadedImageProtocolGuid,
- (VOID **)&LoadedImage
- );
- ASSERT_EFI_ERROR (Status);
-
- Status = gBS->HandleProtocol (
- LoadedImage->DeviceHandle,
- &gEfiSimpleFileSystemProtocolGuid,
- (VOID **)&Vol
- );
- if (!EFI_ERROR (Status)) {
- return Vol;
+ if (mShellProtocol == NULL) {
+ Status = gBS->LocateProtocol (
+ &gEfiShellProtocolGuid,
+ NULL,
+ (VOID **) &mShellProtocol
+ );
+ if (EFI_ERROR (Status)) {
+ mShellProtocol = NULL;
+ }
}
- return NULL;
+ return mShellProtocol;
}
/**
- Read a file from this volume.
+ Read a file.
- @param[in] Vol File System Volume
@param[in] FileName The file to be read.
@param[out] BufferSize The file buffer size
@param[out] Buffer The file buffer
@retval EFI_SUCCESS Read file successfully
- @retval EFI_NOT_FOUND File not found
+ @retval EFI_NOT_FOUND Shell protocol or file not found
+ @retval others Read file failed
**/
EFI_STATUS
-ReadFileFromVol (
- IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Vol,
- IN CHAR16 *FileName,
- OUT UINTN *BufferSize,
- OUT VOID **Buffer
+ReadFileToBuffer (
+ IN CHAR16 *FileName,
+ OUT UINTN *BufferSize,
+ OUT VOID **Buffer
)
{
EFI_STATUS Status;
- EFI_FILE_HANDLE RootDir;
- EFI_FILE_HANDLE Handle;
- UINTN FileInfoSize;
- EFI_FILE_INFO *FileInfo;
+ EFI_SHELL_PROTOCOL *ShellProtocol;
+ SHELL_FILE_HANDLE Handle;
+ UINT64 FileSize;
UINTN TempBufferSize;
VOID *TempBuffer;
- //
- // Open the root directory
- //
- Status = Vol->OpenVolume (Vol, &RootDir);
- if (EFI_ERROR (Status)) {
- return Status;
+ ShellProtocol = GetShellProtocol();
+ if (ShellProtocol == NULL) {
+ return EFI_NOT_FOUND;
}
//
- // Open the file
+ // Open file by FileName.
//
- Status = RootDir->Open (
- RootDir,
- &Handle,
- FileName,
- EFI_FILE_MODE_READ,
- 0
- );
+ Status = ShellProtocol->OpenFileByName (
+ FileName,
+ &Handle,
+ EFI_FILE_MODE_READ
+ );
if (EFI_ERROR (Status)) {
- RootDir->Close (RootDir);
return Status;
}
- RootDir->Close (RootDir);
-
//
- // Get the file information
+ // Get the file size.
//
- FileInfoSize = sizeof(EFI_FILE_INFO) + 1024;
-
- FileInfo = AllocateZeroPool (FileInfoSize);
- if (FileInfo == NULL) {
- Handle->Close (Handle);
- return Status;
- }
-
- Status = Handle->GetInfo (
- Handle,
- &gEfiFileInfoGuid,
- &FileInfoSize,
- FileInfo
- );
+ Status = ShellProtocol->GetFileSize (Handle, &FileSize);
if (EFI_ERROR (Status)) {
- Handle->Close (Handle);
- gBS->FreePool (FileInfo);
+ ShellProtocol->CloseFile (Handle);
return Status;
}
- //
- // Allocate buffer for the file data. The last CHAR16 is for L'\0'
- //
- TempBufferSize = (UINTN) FileInfo->FileSize + sizeof(CHAR16);
+ TempBufferSize = (UINTN) FileSize;
TempBuffer = AllocateZeroPool (TempBufferSize);
if (TempBuffer == NULL) {
- Handle->Close (Handle);
- gBS->FreePool (FileInfo);
- return Status;
+ ShellProtocol->CloseFile (Handle);
+ return EFI_OUT_OF_RESOURCES;
}
- gBS->FreePool (FileInfo);
-
//
// Read the file data to the buffer
//
- Status = Handle->Read (
- Handle,
- &TempBufferSize,
- TempBuffer
- );
+ Status = ShellProtocol->ReadFile (
+ Handle,
+ &TempBufferSize,
+ TempBuffer
+ );
if (EFI_ERROR (Status)) {
- Handle->Close (Handle);
- gBS->FreePool (TempBuffer);
+ ShellProtocol->CloseFile (Handle);
return Status;
}
- Handle->Close (Handle);
+ ShellProtocol->CloseFile (Handle);
*BufferSize = TempBufferSize;
*Buffer = TempBuffer;
return EFI_SUCCESS;
}
-/**
- Read a file.
- If ScanFs is FLASE, it will use this Vol as default Fs.
- If ScanFs is TRUE, it will scan all FS and check the file.
- If there is only one file match the name, it will be read.
- If there is more than one file match the name, it will return Error.
-
- @param[in] ThisVol File System Volume
- @param[in] FileName The file to be read.
- @param[out] BufferSize The file buffer size
- @param[out] Buffer The file buffer
- @param[in] ScanFs Need Scan all FS
-
- @retval EFI_SUCCESS Read file successfully
- @retval EFI_NOT_FOUND File not found
- @retval EFI_NO_MAPPING There is duplicated files found
-**/
-EFI_STATUS
-ReadFileToBufferEx (
- IN OUT EFI_SIMPLE_FILE_SYSTEM_PROTOCOL **ThisVol,
- IN CHAR16 *FileName,
- OUT UINTN *BufferSize,
- OUT VOID **Buffer,
- IN BOOLEAN ScanFs
- )
-{
- EFI_STATUS Status;
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Vol;
- UINTN TempBufferSize;
- VOID *TempBuffer;
- UINTN NoHandles;
- EFI_HANDLE *HandleBuffer;
- UINTN Index;
-
- //
- // Check parameters
- //
- if ((FileName == NULL) || (Buffer == NULL) || (ThisVol == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // not scan fs
- //
- if (!ScanFs) {
- if (*ThisVol == NULL) {
- *ThisVol = GetMyVol ();
- if (*ThisVol == NULL) {
- return EFI_INVALID_PARAMETER;
- }
- }
- //
- // Read file directly from Vol
- //
- return ReadFileFromVol (*ThisVol, FileName, BufferSize, Buffer);
- }
-
- //
- // need scan fs
- //
-
- //
- // Get all Vol handle
- //
- Status = gBS->LocateHandleBuffer (
- ByProtocol,
- &gEfiSimpleFileSystemProtocolGuid,
- NULL,
- &NoHandles,
- &HandleBuffer
- );
- if (EFI_ERROR (Status) && (NoHandles == 0)) {
- return EFI_NOT_FOUND;
- }
-
- //
- // Walk through each Vol
- //
- *ThisVol = NULL;
- *BufferSize = 0;
- *Buffer = NULL;
- for (Index = 0; Index < NoHandles; Index++) {
- Status = gBS->HandleProtocol (
- HandleBuffer[Index],
- &gEfiSimpleFileSystemProtocolGuid,
- (VOID **)&Vol
- );
- if (EFI_ERROR(Status)) {
- continue;
- }
-
- Status = ReadFileFromVol (Vol, FileName, &TempBufferSize, &TempBuffer);
- if (!EFI_ERROR (Status)) {
- //
- // Read file OK, check duplication
- //
- if (*ThisVol != NULL) {
- //
- // Find the duplicated file
- //
- gBS->FreePool (TempBuffer);
- gBS->FreePool (*Buffer);
- Print (L"Duplicated FileName found!\n");
- return EFI_NO_MAPPING;
- } else {
- //
- // Record value
- //
- *ThisVol = Vol;
- *BufferSize = TempBufferSize;
- *Buffer = TempBuffer;
- }
- }
- }
-
- //
- // Scan Fs done
- //
- if (*ThisVol == NULL) {
- return EFI_NOT_FOUND;
- }
-
- //
- // Done
- //
- return EFI_SUCCESS;
-}
-
-/**
- Read a file.
-
- @param[in] FileName The file to be read.
- @param[out] BufferSize The file buffer size
- @param[out] Buffer The file buffer
-
- @retval EFI_SUCCESS Read file successfully
- @retval EFI_NOT_FOUND File not found
-**/
-EFI_STATUS
-ReadFileToBuffer (
- IN CHAR16 *FileName,
- OUT UINTN *BufferSize,
- OUT VOID **Buffer
- )
-{
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Vol;
- Vol = NULL;
- return ReadFileToBufferEx(&Vol, FileName, BufferSize, Buffer, FALSE);
-}
-
/**
Write a file.
@@ -501,6 +167,8 @@ ReadFileToBuffer (
@param[in] Buffer The file buffer
@retval EFI_SUCCESS Write file successfully
+ @retval EFI_NOT_FOUND Shell protocol not found
+ @retval others Write file failed
**/
EFI_STATUS
WriteFileFromBuffer (
@@ -510,79 +178,69 @@ WriteFileFromBuffer (
)
{
EFI_STATUS Status;
- EFI_FILE_HANDLE RootDir;
- EFI_FILE_HANDLE Handle;
+ EFI_SHELL_PROTOCOL *ShellProtocol;
+ SHELL_FILE_HANDLE Handle;
+ EFI_FILE_INFO *FileInfo;
UINTN TempBufferSize;
- EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Vol;
- Vol = GetMyVol();
- if (Vol == NULL) {
+ ShellProtocol = GetShellProtocol();
+ if (ShellProtocol == NULL) {
return EFI_NOT_FOUND;
}
//
- // Open the root directory
- //
- Status = Vol->OpenVolume (Vol, &RootDir);
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- //
- // Open the file
+ // Open file by FileName.
//
- Status = RootDir->Open (
- RootDir,
- &Handle,
- FileName,
- EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE| EFI_FILE_MODE_CREATE,
- 0
- );
+ Status = ShellProtocol->OpenFileByName (
+ FileName,
+ &Handle,
+ EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE
+ );
if (EFI_ERROR (Status)) {
- RootDir->Close (RootDir);
return Status;
}
//
- // Delete file
+ // Empty the file contents.
//
- Status = Handle->Delete(Handle);
- if (EFI_ERROR(Status)) {
- return Status;
+ FileInfo = ShellProtocol->GetFileInfo (Handle);
+ if (FileInfo == NULL) {
+ ShellProtocol->CloseFile (Handle);
+ return EFI_DEVICE_ERROR;
}
//
- // Open the file again
+ // If the file size is already 0, then it has been empty.
//
- Status = RootDir->Open (
- RootDir,
- &Handle,
- FileName,
- EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE| EFI_FILE_MODE_CREATE,
- 0
- );
- if (EFI_ERROR (Status)) {
- RootDir->Close (RootDir);
- return Status;
+ if (FileInfo->FileSize != 0) {
+ //
+ // Set the file size to 0.
+ //
+ FileInfo->FileSize = 0;
+ Status = ShellProtocol->SetFileInfo (Handle, FileInfo);
+ if (EFI_ERROR (Status)) {
+ FreePool (FileInfo);
+ ShellProtocol->CloseFile (Handle);
+ return Status;
+ }
}
-
- RootDir->Close (RootDir);
+ FreePool (FileInfo);
//
// Write the file data from the buffer
//
TempBufferSize = BufferSize;
- Status = Handle->Write (
- Handle,
- &TempBufferSize,
- Buffer
- );
+ Status = ShellProtocol->WriteFile (
+ Handle,
+ &TempBufferSize,
+ Buffer
+ );
if (EFI_ERROR (Status)) {
- Handle->Close (Handle);
+ ShellProtocol->CloseFile (Handle);
return Status;
}
- Handle->Close (Handle);
+ ShellProtocol->CloseFile (Handle);
return EFI_SUCCESS;
}