tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change file global variable to function local. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11539 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2011-04-13 23:37:50 +00:00
parent eef1ed4638
commit 89e8537acf
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ShellPkg/Library/UefiShellLib/UefiShellLib.c
View File

@ -34,8 +34,6 @@ EFI_SHELL_PROTOCOL *mEfiShellProtocol;
EFI_SHELL_PARAMETERS_PROTOCOL *mEfiShellParametersProtocol; EFI_SHELL_PARAMETERS_PROTOCOL *mEfiShellParametersProtocol;
EFI_HANDLE mEfiShellEnvironment2Handle; EFI_HANDLE mEfiShellEnvironment2Handle;
FILE_HANDLE_FUNCTION_MAP FileFunctionMap; FILE_HANDLE_FUNCTION_MAP FileFunctionMap;
CHAR16 *mPostReplaceFormat;
CHAR16 *mPostReplaceFormat2;
/** /**
Check if a Unicode character is a hexadecimal character. Check if a Unicode character is a hexadecimal character.
@ -177,10 +175,6 @@ ShellLibConstructorWorker (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
mPostReplaceFormat = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
ASSERT (mPostReplaceFormat != NULL);
mPostReplaceFormat2 = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
ASSERT (mPostReplaceFormat2 != NULL);
// //
// UEFI 2.0 shell interfaces (used preferentially) // UEFI 2.0 shell interfaces (used preferentially)
@ -295,8 +289,6 @@ ShellLibConstructor (
mEfiShellParametersProtocol = NULL; mEfiShellParametersProtocol = NULL;
mEfiShellInterface = NULL; mEfiShellInterface = NULL;
mEfiShellEnvironment2Handle = NULL; mEfiShellEnvironment2Handle = NULL;
mPostReplaceFormat = NULL;
mPostReplaceFormat2 = NULL;
// //
// verify that auto initialize is not set false // verify that auto initialize is not set false
@ -354,15 +346,6 @@ ShellLibDestructor (
} }
mEfiShellEnvironment2Handle = NULL; mEfiShellEnvironment2Handle = NULL;
if (mPostReplaceFormat != NULL) {
FreePool(mPostReplaceFormat);
}
if (mPostReplaceFormat2 != NULL) {
FreePool(mPostReplaceFormat2);
}
mPostReplaceFormat = NULL;
mPostReplaceFormat2 = NULL;
return (EFI_SUCCESS); return (EFI_SUCCESS);
} }
@ -1655,6 +1638,9 @@ ShellFindFilePath (
if (TestPath[StrLen(TestPath)-1] != L'\\') { if (TestPath[StrLen(TestPath)-1] != L'\\') {
StrCat(TestPath, L"\\"); StrCat(TestPath, L"\\");
} }
if (FileName[0] == L'\\') {
FileName++;
}
StrCat(TestPath, FileName); StrCat(TestPath, FileName);
if (StrStr(Walker, L";") != NULL) { if (StrStr(Walker, L";") != NULL) {
Walker = StrStr(Walker, L";") + 1; Walker = StrStr(Walker, L";") + 1;
@ -2614,6 +2600,11 @@ InternalShellPrintWorker(
CHAR16 *ResumeLocation; CHAR16 *ResumeLocation;
CHAR16 *FormatWalker; CHAR16 *FormatWalker;
UINTN OriginalAttribute; UINTN OriginalAttribute;
CHAR16 *mPostReplaceFormat;
CHAR16 *mPostReplaceFormat2;
mPostReplaceFormat = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
mPostReplaceFormat2 = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
OriginalAttribute = gST->ConOut->Mode->Attribute; OriginalAttribute = gST->ConOut->Mode->Attribute;
@ -2705,6 +2696,9 @@ InternalShellPrintWorker(
} }
gST->ConOut->SetAttribute(gST->ConOut, OriginalAttribute); gST->ConOut->SetAttribute(gST->ConOut, OriginalAttribute);
SHELL_FREE_NON_NULL(mPostReplaceFormat);
SHELL_FREE_NON_NULL(mPostReplaceFormat2);
return (Status); return (Status);
} }