sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Revert 16720 and 16734.

Browse Source 
I will submit a new patch.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16758 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey
2015-02-04 16:46:59 +00:00
committed by jcarsey
parent a95cf8f0f4
commit fe8ec3dd93
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,21 +211,20 @@ ContainsSplit(
SecondQuote = NULL; SecondQuote = NULL;
TempSpot = FindFirstCharacter(CmdLine, L"|", L'^'); TempSpot = FindFirstCharacter(CmdLine, L"|", L'^');
if (FirstQuote == NULL || if (FirstQuote == NULL ||
*FirstQuote == CHAR_NULL || TempSpot == NULL ||
TempSpot == NULL || TempSpot == CHAR_NULL ||
*TempSpot == CHAR_NULL ||
FirstQuote > TempSpot FirstQuote > TempSpot
) { ) {
return (BOOLEAN) ((TempSpot != NULL) && (*TempSpot != CHAR_NULL)); return (BOOLEAN) ((TempSpot != NULL) && (*TempSpot != CHAR_NULL));
} }
while ((TempSpot != NULL) && (*TempSpot != CHAR_NULL)) { while ((TempSpot != NULL) && (*TempSpot != CHAR_NULL)) {
if (FirstQuote == NULL || *FirstQuote == CHAR_NULL || FirstQuote > TempSpot) { if (FirstQuote == NULL || FirstQuote > TempSpot) {
break; break;
} }
SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE); SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE);
if (SecondQuote == NULL || *SecondQuote == CHAR_NULL) { if (SecondQuote == NULL) {
break; break;
} }
if (SecondQuote < TempSpot) { if (SecondQuote < TempSpot) {
@ -1375,7 +1374,7 @@ StripUnreplacedEnvironmentVariables(
continue; continue;
} }
if (FirstQuote == NULL || *FirstQuote == CHAR_NULL || SecondPercent < FirstQuote) { if (FirstQuote == NULL || SecondPercent < FirstQuote) {
if (IsValidEnvironmentVariableName(FirstPercent, SecondPercent)) { if (IsValidEnvironmentVariableName(FirstPercent, SecondPercent)) {
// //
// We need to remove from FirstPercent to SecondPercent // We need to remove from FirstPercent to SecondPercent