ShellPkg: replace unrecognized Environment Variables with empty quotes so commands...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
Reviewed-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15547 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 951d31e82bcd84a3b0ec181825c69430fdbdd85c..4abeafcd44474f08a9c45e05ff263bf4ada4d3f0 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -1378,14 +1378,14 @@ StripUnreplacedEnvironmentVariables(
     }\r
     ASSERT(FirstPercent < FirstQuote);\r
     if (SecondPercent < FirstQuote) {\r
-      //\r
-      // We need to remove from FirstPercent to SecondPercent\r
-      //\r
-      CopyMem(FirstPercent, SecondPercent + 1, StrSize(SecondPercent + 1));\r
+      FirstPercent[0] = L'\"';\r
+      SecondPercent[0] = L'\"';\r
 \r
       //\r
-      // dont need to update the locator.  both % characters are gone.\r
+      // We need to remove from FirstPercent to SecondPercent\r
       //\r
+      CopyMem(FirstPercent + 1, SecondPercent, StrSize(SecondPercent));\r
+      CurrentLocator = FirstPercent + 2;\r
       continue;\r
     }\r
     ASSERT(FirstQuote < SecondPercent);\r