diff options
| author | Jaben Carsey <Jaben.carsey@intel.com> | 2015-02-04 16:46:59 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@Edk2> | 2015-02-04 16:46:59 +0000 |
| commit | fe8ec3dd93dacdf2bbe983d48453d92ae3b1b314 (patch) | |
| tree | 3cbed4261dfb61d4e3a19de0030e7a20d1966082 /ShellPkg | |
| parent | a95cf8f0f413142d91521b73e7e391319e97199c (diff) | |
| download | edk2-fe8ec3dd93dacdf2bbe983d48453d92ae3b1b314.tar.gz edk2-fe8ec3dd93dacdf2bbe983d48453d92ae3b1b314.tar.bz2 edk2-fe8ec3dd93dacdf2bbe983d48453d92ae3b1b314.zip | |
ShellPkg: Revert 16720 and 16734.
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
Diffstat (limited to 'ShellPkg')
| -rw-r--r-- | ShellPkg/Application/Shell/Shell.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 52b6834ab9..dcf48d3223 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -211,21 +211,20 @@ ContainsSplit( SecondQuote = NULL;
TempSpot = FindFirstCharacter(CmdLine, L"|", L'^');
- if (FirstQuote == NULL ||
- *FirstQuote == CHAR_NULL ||
- TempSpot == NULL ||
- *TempSpot == CHAR_NULL ||
+ if (FirstQuote == NULL ||
+ TempSpot == NULL ||
+ TempSpot == CHAR_NULL ||
FirstQuote > TempSpot
) {
return (BOOLEAN) ((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;
}
SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE);
- if (SecondQuote == NULL || *SecondQuote == CHAR_NULL) {
+ if (SecondQuote == NULL) {
break;
}
if (SecondQuote < TempSpot) {
@@ -1375,7 +1374,7 @@ StripUnreplacedEnvironmentVariables( continue;
}
- if (FirstQuote == NULL || *FirstQuote == CHAR_NULL || SecondPercent < FirstQuote) {
+ if (FirstQuote == NULL || SecondPercent < FirstQuote) {
if (IsValidEnvironmentVariableName(FirstPercent, SecondPercent)) {
//
// We need to remove from FirstPercent to SecondPercent
|