Revision: 16758
http://sourceforge.net/p/edk2/code/16758
Author: jcarsey
Date: 2015-02-04 16:46:59 +0000 (Wed, 04 Feb 2015)
Log Message:
-----------
ShellPkg: Revert 16720 and 16734.
I will submit a new patch.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <[email protected]>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Application/Shell/Shell.c
Modified: trunk/edk2/ShellPkg/Application/Shell/Shell.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/Shell.c 2015-02-04 16:39:04 UTC
(rev 16757)
+++ trunk/edk2/ShellPkg/Application/Shell/Shell.c 2015-02-04 16:46:59 UTC
(rev 16758)
@@ -211,21 +211,20 @@
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 @@
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
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
