Fix EBL GetCurrentIpAddress & GetCurrentMacAddress commands. Add variable services...

[mirror_edk2.git] / EmbeddedPkg / Ebl / Main.c

diff --git a/EmbeddedPkg/Ebl/Main.c b/EmbeddedPkg/Ebl/Main.c
index 98097e4be1a726438a7d8b944784ef83809c1b38..8f6f4ea9e1579fbf06c10fe95471936738b14c46 100644 (file)
--- a/EmbeddedPkg/Ebl/Main.c
+++ b/EmbeddedPkg/Ebl/Main.c
@@ -187,7 +187,7 @@ ParseArguments (
       break;\r
     }\r
 \r
-    // Perform any text coversion here\r
+    // Perform any text conversion here\r
     if (*Char == '\t') {\r
       // TAB to space\r
       *Char = ' ';\r
@@ -205,9 +205,14 @@ ParseArguments (
       } \r
     } else {\r
       // Looking for the terminator of an Argv[] entry\r
-      if ((InQuote && (*Char == '"')) || (!InQuote && (*Char == ' '))) {\r
+      if (!InQuote && (*Char == ' ')) {\r
         *Char = '\0';\r
         LookingForArg = TRUE;\r
+      } else if (!InQuote && (*Char == '"') && (*(Char-1) != '\\')) {\r
+        InQuote = TRUE;\r
+      } else if (InQuote && (*Char == '"') && (*(Char-1) != '\\')) {\r
+        *Char = '\0';\r
+        InQuote = FALSE;\r
       }\r
     }    \r
   }\r
@@ -597,6 +602,7 @@ EdkBootLoaderEntry (
   EblInitializeScriptCmd ();\r
   EblInitializeExternalCmd ();\r
   EblInitializeNetworkCmd();\r
+  EblInitializeVariableCmds ();\r
   \r
   // Disable the 5 minute EFI watchdog time so we don't get automatically reset\r
   gBS->SetWatchdogTimer (0, 0, 0, NULL);\r