diff options
| author | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-05-17 20:32:47 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-05-17 20:32:47 +0000 |
| commit | 77dd0c814e8660e6cbe73ff471701bad799ae24a (patch) | |
| tree | 54a0f58b219c17ae6e849a99f0b7513b14301190 | |
| parent | deff65a4fd3769550a583d7cec1c2fcf9ba65d28 (diff) | |
| download | edk2-77dd0c814e8660e6cbe73ff471701bad799ae24a.tar.gz edk2-77dd0c814e8660e6cbe73ff471701bad799ae24a.tar.bz2 edk2-77dd0c814e8660e6cbe73ff471701bad799ae24a.zip | |
Clarify an error in Map command.
Revert a change in Map command that affected some consistent map names being printed correctly.
Fix a library instance mapping in DSC.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11675 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 8 | ||||
| -rw-r--r-- | ShellPkg/ShellPkg.dsc | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c index 266145c08d..358f63d8db 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c @@ -347,7 +347,7 @@ MappingListHasType( if ( Consist
&& (SearchList(MapList, L"HD*", NULL, TRUE, TRUE, L";")
||SearchList(MapList, L"CD*", NULL, TRUE, TRUE, L";")
- ||SearchList(MapList, L"AnyF*", NULL, TRUE, TRUE, L";")
+ ||SearchList(MapList, L"F*", NULL, TRUE, TRUE, L";")
||SearchList(MapList, L"FP*", NULL, TRUE, TRUE, L";"))){
return (TRUE);
}
@@ -686,7 +686,11 @@ PerformMappingDisplay( FreePool(HandleBuffer);
}
if (!Found) {
- ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, Specific);
+ if (Specific != NULL) {
+ ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, Specific);
+ } else {
+ ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle);
+ }
}
return (SHELL_SUCCESS);
}
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index d929bccc41..6ac336179c 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -44,7 +44,7 @@ ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
- SortLib|ShellPkg/Library/BaseSortLib/BaseSortLib.inf
+ SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
|