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

ShellPkg: Refactor out a now-redundant function 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
Reviewed-by: Joe Peterson <joe.peterson@intel.com>
Reviewed-by: Shumin Qiu <shumin.qiu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16720 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey 2015-02-03 16:50:12 +00:00 committed by jcarsey
parent 720f553df6
commit 0a82f7af9b
1 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ShellPkg/Application/Shell/Shell.c
View File

@ -100,48 +100,6 @@ TrimSpaces(
return (EFI_SUCCESS); return (EFI_SUCCESS);
} }
/**
Parse for the next instance of one string within another string. Can optionally make sure that
the string was not escaped (^ character) per the shell specification.
@param[in] SourceString The string to search within
@param[in] FindString The string to look for
@param[in] CheckForEscapeCharacter TRUE to skip escaped instances of FinfString, otherwise will return even escaped instances
**/
CHAR16*
EFIAPI
FindNextInstance(
IN CONST CHAR16 *SourceString,
IN CONST CHAR16 *FindString,
IN CONST BOOLEAN CheckForEscapeCharacter
)
{
CHAR16 *Temp;
if (SourceString == NULL) {
return (NULL);
}
Temp = StrStr(SourceString, FindString);
//
// If nothing found, or we dont care about escape characters
//
if (Temp == NULL || !CheckForEscapeCharacter) {
return (Temp);
}
//
// If we found an escaped character, try again on the remainder of the string
//
if ((Temp > (SourceString)) && *(Temp-1) == L'^') {
return FindNextInstance(Temp+1, FindString, CheckForEscapeCharacter);
}
//
// we found the right character
//
return (Temp);
}
/** /**
Check whether the string between a pair of % is a valid envifronment variable name. Check whether the string between a pair of % is a valid envifronment variable name.
@ -207,7 +165,7 @@ ContainsSplit(
CONST CHAR16 *FirstQuote; CONST CHAR16 *FirstQuote;
CONST CHAR16 *SecondQuote; CONST CHAR16 *SecondQuote;
FirstQuote = FindNextInstance (CmdLine, L"\"", TRUE); FirstQuote = FindFirstCharacter (CmdLine, L"\"", L'^');
SecondQuote = NULL; SecondQuote = NULL;
TempSpot = FindFirstCharacter(CmdLine, L"|", L'^'); TempSpot = FindFirstCharacter(CmdLine, L"|", L'^');
@ -223,15 +181,15 @@ ContainsSplit(
if (FirstQuote == NULL || FirstQuote > TempSpot) { if (FirstQuote == NULL || FirstQuote > TempSpot) {
break; break;
} }
SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE); SecondQuote = FindFirstCharacter (FirstQuote + 1, L"\"", L'^');
if (SecondQuote == NULL) { if (SecondQuote == NULL) {
break; break;
} }
if (SecondQuote < TempSpot) { if (SecondQuote < TempSpot) {
FirstQuote = FindNextInstance (SecondQuote + 1, L"\"", TRUE); FirstQuote = FindFirstCharacter (SecondQuote + 1, L"\"", L'^');
continue; continue;
} else { } else {
FirstQuote = FindNextInstance (SecondQuote + 1, L"\"", TRUE); FirstQuote = FindFirstCharacter (SecondQuote + 1, L"\"", L'^');
TempSpot = FindFirstCharacter(TempSpot + 1, L"|", L'^'); TempSpot = FindFirstCharacter(TempSpot + 1, L"|", L'^');
continue; continue;
} }
@ -1344,9 +1302,9 @@ StripUnreplacedEnvironmentVariables(
CHAR16 *CurrentLocator; CHAR16 *CurrentLocator;
for (CurrentLocator = CmdLine ; CurrentLocator != NULL ; ) { for (CurrentLocator = CmdLine ; CurrentLocator != NULL ; ) {
FirstQuote = FindNextInstance(CurrentLocator, L"\"", TRUE); FirstQuote = FindFirstCharacter(CurrentLocator, L"\"", L'^');
FirstPercent = FindNextInstance(CurrentLocator, L"%", TRUE); FirstPercent = FindFirstCharacter(CurrentLocator, L"%", L'^');
SecondPercent = FirstPercent!=NULL?FindNextInstance(FirstPercent+1, L"%", TRUE):NULL; SecondPercent = FirstPercent!=NULL?FindFirstCharacter(FirstPercent+1, L"%", L'^'):NULL;
if (FirstPercent == NULL || SecondPercent == NULL) { if (FirstPercent == NULL || SecondPercent == NULL) {
// //
// If we ever dont have 2 % we are done. // If we ever dont have 2 % we are done.
@ -1355,11 +1313,10 @@ StripUnreplacedEnvironmentVariables(
} }
if (FirstQuote!= NULL && FirstQuote < FirstPercent) { if (FirstQuote!= NULL && FirstQuote < FirstPercent) {
SecondQuote = FindNextInstance(FirstQuote+1, L"\"", TRUE); SecondQuote = FindFirstCharacter(FirstQuote+1, L"\"", L'^');
// //
// Quote is first found // Quote is first found
// //
if (SecondQuote < FirstPercent) { if (SecondQuote < FirstPercent) {
// //
// restart after the pair of " // restart after the pair of "