ShellPkg: verify that leading and trailing % are removed from variable names when...

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

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 3564e066600fc77ba5c2e641101da61d1678f623..b6598c0cf40dc8329e453ad0d0e9ef1126c5e04d 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -538,6 +538,35 @@ FixFileName (
   return (Copy);\r
 }\r
 \r
+/**\r
+  Fix a string to only have the environment variable name, removing starting at the first space of whatever is quoted and removing the leading and trailing %.\r
+\r
+  @param[in]  FileName    The filename to start with.\r
+\r
+  @retval NULL  FileName was invalid.\r
+  @return       The modified FileName.\r
+**/\r
+CHAR16*\r
+EFIAPI\r
+FixVarName (\r
+  IN CHAR16 *FileName\r
+  )\r
+{\r
+  CHAR16  *Copy;\r
+  CHAR16  *TempLocation;\r
+\r
+  Copy = FileName;\r
+\r
+  if (FileName[0] == L'%') {\r
+    Copy = FileName+1;\r
+    if ((TempLocation = StrStr(Copy , L"%")) != NULL) {\r
+      TempLocation[0] = CHAR_NULL;\r
+    }    \r
+  }\r
+\r
+  return (FixFileName(Copy));\r
+}\r
+\r
 /**\r
   Funcion will replace the current StdIn and StdOut in the ShellParameters protocol\r
   structure by parsing NewCommandLine.  The current values are returned to the\r
@@ -914,17 +943,17 @@ UpdateStdInStdOutStdErr(
       }\r
     }\r
     if (StdErrVarName  != NULL) {\r
-      if ((StdErrVarName     = FixFileName(StdErrVarName)) == NULL) {\r
+      if ((StdErrVarName     = FixVarName(StdErrVarName)) == NULL) {\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
     }\r
     if (StdOutVarName  != NULL) {\r
-      if ((StdOutVarName     = FixFileName(StdOutVarName)) == NULL) {\r
+      if ((StdOutVarName     = FixVarName(StdOutVarName)) == NULL) {\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
     }\r
     if (StdInVarName   != NULL) {\r
-      if ((StdInVarName      = FixFileName(StdInVarName)) == NULL) {\r
+      if ((StdInVarName      = FixVarName(StdInVarName)) == NULL) {\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
     }\r