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

ShellPkg: parameters with spaces need quotes. 

signed-off-by: jcarsey
reviewed-by: leegrosenbaum

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12960 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2012-01-27 18:42:43 +00:00
parent e1d996b391
commit 49bd498dfe
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/** @file /** @file
Provides interface to shell functionality for shell commands and applications. Provides interface to shell functionality for shell commands and applications.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -2015,15 +2015,34 @@ InternalCommandLineParse (
// //
// get the item VALUE for a previous flag // get the item VALUE for a previous flag
// //
CurrentItemPackage->Value = ReallocatePool(ValueSize, ValueSize + StrSize(Argv[LoopCounter]) + sizeof(CHAR16), CurrentItemPackage->Value); if (StrStr(Argv[LoopCounter], L" ") == NULL) {
ASSERT(CurrentItemPackage->Value != NULL); CurrentItemPackage->Value = ReallocatePool(ValueSize, ValueSize + StrSize(Argv[LoopCounter]) + sizeof(CHAR16), CurrentItemPackage->Value);
if (ValueSize == 0) { ASSERT(CurrentItemPackage->Value != NULL);
StrCpy(CurrentItemPackage->Value, Argv[LoopCounter]); if (ValueSize == 0) {
StrCpy(CurrentItemPackage->Value, Argv[LoopCounter]);
} else {
StrCat(CurrentItemPackage->Value, L" ");
StrCat(CurrentItemPackage->Value, Argv[LoopCounter]);
}
ValueSize += StrSize(Argv[LoopCounter]) + sizeof(CHAR16);
} else { } else {
StrCat(CurrentItemPackage->Value, L" "); //
StrCat(CurrentItemPackage->Value, Argv[LoopCounter]); // the parameter has spaces. must be quoted.
//
CurrentItemPackage->Value = ReallocatePool(ValueSize, ValueSize + StrSize(Argv[LoopCounter]) + sizeof(CHAR16) + sizeof(CHAR16) + sizeof(CHAR16), CurrentItemPackage->Value);
ASSERT(CurrentItemPackage->Value != NULL);
if (ValueSize == 0) {
StrCpy(CurrentItemPackage->Value, L"\"");
StrCat(CurrentItemPackage->Value, Argv[LoopCounter]);
StrCat(CurrentItemPackage->Value, L"\"");
} else {
StrCat(CurrentItemPackage->Value, L" ");
StrCat(CurrentItemPackage->Value, L"\"");
StrCat(CurrentItemPackage->Value, Argv[LoopCounter]);
StrCat(CurrentItemPackage->Value, L"\"");
}
ValueSize += StrSize(Argv[LoopCounter]) + sizeof(CHAR16);
} }
ValueSize += StrSize(Argv[LoopCounter]) + sizeof(CHAR16);
GetItemValue--; GetItemValue--;
if (GetItemValue == 0) { if (GetItemValue == 0) {
InsertHeadList(*CheckPackage, &CurrentItemPackage->Link); InsertHeadList(*CheckPackage, &CurrentItemPackage->Link);
@ -2587,12 +2606,10 @@ InternalPrintTo (
return (gEfiShellProtocol->WriteFile(gEfiShellParametersProtocol->StdOut, &Size, (VOID*)String)); return (gEfiShellProtocol->WriteFile(gEfiShellParametersProtocol->StdOut, &Size, (VOID*)String));
} }
if (mEfiShellInterface != NULL) { if (mEfiShellInterface != NULL) {
if (mEfiShellInterface->RedirArgc == 0) { //
// // Divide in half for old shell. Must be string length not size.
// Divide in half for old shell. Must be string length not size. //
// Size /= 2;
Size /=2; // Divide in half only when no redirection.
}
return (mEfiShellInterface->StdOut->Write(mEfiShellInterface->StdOut, &Size, (VOID*)String)); return (mEfiShellInterface->StdOut->Write(mEfiShellInterface->StdOut, &Size, (VOID*)String));
} }
ASSERT(FALSE); ASSERT(FALSE);
@ -3647,10 +3664,10 @@ InternalShellStrHexToUint64 (
String++; String++;
// //
// Skip spaces if requested // stop at spaces if requested
// //
while (StopAtSpace && *String == L' ') { if (StopAtSpace && *String == L' ') {
String++; break;
} }
} }