X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel2CommandsLib%2FMap.c;h=9166ca2205ca2631a62c81aaf20505233c2ebdbc;hp=9248698459f8fc7407c4b3618335d8231ff0a07f;hb=4887443e4f03ec42ba422483f191ffe25a78eb3d;hpb=099e8ff5d2876b1d1606c3424114969946c15173
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 9248698459..9166ca2205 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,8 +1,10 @@
/** @file
Main file for map shell level 2 command.
- Copyright (c) 2013 - 2015, Hewlett-Packard Development Company, L.P.
- Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
+ (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+
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
@@ -32,7 +34,6 @@
@retval FALSE String has at least one other character.
**/
BOOLEAN
-EFIAPI
IsNumberLetterOnly(
IN CONST CHAR16 *String,
IN CONST UINTN Len
@@ -63,7 +64,6 @@ IsNumberLetterOnly(
items (";" normally).
**/
BOOLEAN
-EFIAPI
SearchList(
IN CONST CHAR16 *List,
IN CONST CHAR16 *MetaTarget,
@@ -131,7 +131,6 @@ SearchList(
@retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
**/
CHAR16*
-EFIAPI
GetDeviceMediaType (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -177,7 +176,6 @@ GetDeviceMediaType (
@retval FALSE The handle does not have removable storage.
**/
BOOLEAN
-EFIAPI
IsRemoveableDevice (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -214,7 +212,6 @@ IsRemoveableDevice (
@retval FALSE The map should not be displayed.
**/
BOOLEAN
-EFIAPI
MappingListHasType(
IN CONST CHAR16 *MapList,
IN CONST CHAR16 *Specific,
@@ -223,17 +220,29 @@ MappingListHasType(
IN CONST BOOLEAN Consist
)
{
- CHAR16 *NewSpecific;
+ CHAR16 *NewSpecific;
+ RETURN_STATUS Status;
+ UINTN Length;
+
//
// specific has priority
//
if (Specific != NULL) {
- NewSpecific = AllocateCopyPool(StrSize(Specific) + sizeof(CHAR16), Specific);
+ Length = StrLen (Specific);
+ //
+ // Allocate enough buffer for Specific and potential ":"
+ //
+ NewSpecific = AllocatePool ((Length + 2) * sizeof(CHAR16));
if (NewSpecific == NULL){
return FALSE;
}
- if (NewSpecific[StrLen(NewSpecific)-1] != L':') {
- StrnCat(NewSpecific, L":", 2);
+ StrCpyS (NewSpecific, Length + 2, Specific);
+ if (Specific[Length - 1] != L':') {
+ Status = StrnCatS(NewSpecific, Length + 2, L":", StrLen(L":"));
+ if (EFI_ERROR (Status)) {
+ FreePool(NewSpecific);
+ return FALSE;
+ }
}
if (SearchList(MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {
@@ -279,7 +288,6 @@ MappingListHasType(
@retval EFI_SUCCESS The mapping was displayed.
**/
EFI_STATUS
-EFIAPI
PerformSingleMappingDisplay(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -453,7 +461,6 @@ PerformSingleMappingDisplay(
@retval EFI_NOT_FOUND Name was not a map on Handle.
**/
EFI_STATUS
-EFIAPI
PerformSingleMappingDelete(
IN CONST CHAR16 *Specific,
IN CONST EFI_HANDLE Handle
@@ -504,7 +511,6 @@ CONST CHAR16 AnyF[] = L"F*";
**/
SHELL_STATUS
-EFIAPI
PerformMappingDisplay(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -682,7 +688,6 @@ PerformMappingDisplay(
@sa PerformMappingDisplay
**/
SHELL_STATUS
-EFIAPI
PerformMappingDisplay2(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -735,7 +740,6 @@ PerformMappingDisplay2(
@retval EFI_NOT_FOUND Specific could not be found.
**/
EFI_STATUS
-EFIAPI
PerformMappingDelete(
IN CONST CHAR16 *Specific
)
@@ -866,7 +870,6 @@ PerformMappingDelete(
**/
SHELL_STATUS
-EFIAPI
AddMappingFromMapping(
IN CONST CHAR16 *Map,
IN CONST CHAR16 *SName
@@ -875,13 +878,18 @@ AddMappingFromMapping(
CONST EFI_DEVICE_PATH_PROTOCOL *DevPath;
EFI_STATUS Status;
CHAR16 *NewSName;
+ RETURN_STATUS StrRetStatus;
NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);
if (NewSName == NULL) {
return (SHELL_OUT_OF_RESOURCES);
}
if (NewSName[StrLen(NewSName)-1] != L':') {
- StrnCat(NewSName, L":", 2);
+ StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));
+ if (EFI_ERROR(StrRetStatus)) {
+ FreePool(NewSName);
+ return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));
+ }
}
if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {
@@ -918,7 +926,6 @@ AddMappingFromMapping(
**/
SHELL_STATUS
-EFIAPI
AddMappingFromHandle(
IN CONST EFI_HANDLE Handle,
IN CONST CHAR16 *SName
@@ -927,13 +934,18 @@ AddMappingFromHandle(
EFI_DEVICE_PATH_PROTOCOL *DevPath;
EFI_STATUS Status;
CHAR16 *NewSName;
+ RETURN_STATUS StrRetStatus;
NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);
if (NewSName == NULL) {
return (SHELL_OUT_OF_RESOURCES);
}
if (NewSName[StrLen(NewSName)-1] != L':') {
- StrnCat(NewSName, L":", 2);
+ StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));
+ if (EFI_ERROR(StrRetStatus)) {
+ FreePool(NewSName);
+ return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));
+ }
}
if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {
@@ -973,6 +985,57 @@ STATIC CONST SHELL_PARAM_ITEM MapParamList[] = {
{NULL, TypeMax}
};
+/**
+ The routine issues dummy read for every physical block device to cause
+ the BlockIo re-installed if media change happened.
+**/
+VOID
+ProbeForMediaChange (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ UINTN HandleCount;
+ EFI_HANDLE *Handles;
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;
+ UINTN Index;
+
+ gBS->LocateHandleBuffer (
+ ByProtocol,
+ &gEfiBlockIoProtocolGuid,
+ NULL,
+ &HandleCount,
+ &Handles
+ );
+ //
+ // Probe for media change for every physical block io
+ //
+ for (Index = 0; Index < HandleCount; Index++) {
+ Status = gBS->HandleProtocol (
+ Handles[Index],
+ &gEfiBlockIoProtocolGuid,
+ (VOID **) &BlockIo
+ );
+ if (!EFI_ERROR (Status)) {
+ if (!BlockIo->Media->LogicalPartition) {
+ //
+ // Per spec:
+ // The function (ReadBlocks) must return EFI_NO_MEDIA or
+ // EFI_MEDIA_CHANGED even if LBA, BufferSize, or Buffer are invalid so the caller can probe
+ // for changes in media state.
+ //
+ BlockIo->ReadBlocks (
+ BlockIo,
+ BlockIo->Media->MediaId,
+ 0,
+ 0,
+ NULL
+ );
+ }
+ }
+ }
+}
+
/**
Function for 'map' command.
@@ -1081,6 +1144,7 @@ ShellCommandRunMap (
|| ShellCommandLineGetFlag(Package, L"-u")
|| ShellCommandLineGetFlag(Package, L"-t")
){
+ ProbeForMediaChange ();
if ( ShellCommandLineGetFlag(Package, L"-r")) {
//
// Do the reset
@@ -1180,51 +1244,48 @@ ShellCommandRunMap (
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
- if (MapAsHandle != NULL) {
- TempStringLength = StrLen(SName);
- if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);
- ShellStatus = SHELL_INVALID_PARAMETER;
- } else {
+ TempStringLength = StrLen(SName);
+ if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);
+ ShellStatus = SHELL_INVALID_PARAMETER;
+ }
+
+ if (ShellStatus == SHELL_SUCCESS) {
+ if (MapAsHandle != NULL) {
ShellStatus = AddMappingFromHandle(MapAsHandle, SName);
- }
- } else {
- TempStringLength = StrLen(SName);
- if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);
- ShellStatus = SHELL_INVALID_PARAMETER;
} else {
ShellStatus = AddMappingFromMapping(Mapping, SName);
}
+
+ if (ShellStatus != SHELL_SUCCESS) {
+ switch (ShellStatus) {
+ case SHELL_ACCESS_DENIED:
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");
+ break;
+ case SHELL_INVALID_PARAMETER:
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);
+ break;
+ case SHELL_DEVICE_ERROR:
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);
+ break;
+ default:
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);
+ }
+ } else {
+ //
+ // now do the display...
+ //
+ ShellStatus = PerformMappingDisplay(
+ FALSE,
+ FALSE,
+ FALSE,
+ NULL,
+ SfoMode,
+ SName,
+ TRUE
+ );
+ } // we were sucessful so do an output
}
- if (ShellStatus != SHELL_SUCCESS) {
- switch (ShellStatus) {
- case SHELL_ACCESS_DENIED:
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");
- break;
- case SHELL_INVALID_PARAMETER:
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);
- break;
- case SHELL_DEVICE_ERROR:
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);
- break;
- default:
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);
- }
- } else {
- //
- // now do the display...
- //
- ShellStatus = PerformMappingDisplay(
- FALSE,
- FALSE,
- FALSE,
- NULL,
- SfoMode,
- SName,
- TRUE
- );
- } // we were sucessful so do an output
} // got a valid map target
} // got 2 variables
} // we are adding a mapping