ShellPkg: refine command line parsing

Correctly divide up parameters for Argc/Argv including quote ("), escape (^), and space ( ) processing.

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

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index a570b7b1254cc32eb2c67d407eb0fb2c06053505..7eaccb747cccb65088eb6e9243039fa3ffe0129f 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -1870,12 +1870,12 @@ IsValidSplit(
       return (EFI_OUT_OF_RESOURCES);\r
     }\r
     TempWalker = (CHAR16*)Temp;\r
-    GetNextParameter(&TempWalker, &FirstParameter, StrSize(CmdLine));\r
-\r
-    if (GetOperationType(FirstParameter) == Unknown_Invalid) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_NOT_FOUND), ShellInfoObject.HiiHandle, FirstParameter);\r
-      SetLastError(SHELL_NOT_FOUND);\r
-      Status = EFI_NOT_FOUND;\r
+    if (!EFI_ERROR(GetNextParameter(&TempWalker, &FirstParameter, StrSize(CmdLine)))) {\r
+      if (GetOperationType(FirstParameter) == Unknown_Invalid) {\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_NOT_FOUND), ShellInfoObject.HiiHandle, FirstParameter);\r
+        SetLastError(SHELL_NOT_FOUND);\r
+        Status = EFI_NOT_FOUND;\r
+      }\r
     }\r
   }\r
 \r
@@ -2030,24 +2030,25 @@ DoHelpUpdate(
   Walker = *CmdLine;\r
   while(Walker != NULL && *Walker != CHAR_NULL) {\r
     LastWalker = Walker;\r
-    GetNextParameter(&Walker, &CurrentParameter, StrSize(*CmdLine));\r
-    if (StrStr(CurrentParameter, L"-?") == CurrentParameter) {\r
-      LastWalker[0] = L' ';\r
-      LastWalker[1] = L' ';\r
-      NewCommandLine = AllocateZeroPool(StrSize(L"help ") + StrSize(*CmdLine));\r
-      if (NewCommandLine == NULL) {\r
-        Status = EFI_OUT_OF_RESOURCES;\r
+    if (!EFI_ERROR(GetNextParameter(&Walker, &CurrentParameter, StrSize(*CmdLine)))) {\r
+      if (StrStr(CurrentParameter, L"-?") == CurrentParameter) {\r
+        LastWalker[0] = L' ';\r
+        LastWalker[1] = L' ';\r
+        NewCommandLine = AllocateZeroPool(StrSize(L"help ") + StrSize(*CmdLine));\r
+        if (NewCommandLine == NULL) {\r
+          Status = EFI_OUT_OF_RESOURCES;\r
+          break;\r
+        }\r
+\r
+        //\r
+        // We know the space is sufficient since we just calculated it.\r
+        //\r
+        StrnCpy(NewCommandLine, L"help ", 5);\r
+        StrnCat(NewCommandLine, *CmdLine, StrLen(*CmdLine));\r
+        SHELL_FREE_NON_NULL(*CmdLine);\r
+        *CmdLine = NewCommandLine;\r
         break;\r
       }\r
-\r
-      //\r
-      // We know the space is sufficient since we just calculated it.\r
-      //\r
-      StrnCpy(NewCommandLine, L"help ", 5);\r
-      StrnCat(NewCommandLine, *CmdLine, StrLen(*CmdLine));\r
-      SHELL_FREE_NON_NULL(*CmdLine);\r
-      *CmdLine = NewCommandLine;\r
-      break;\r
     }\r
   }\r
 \r
@@ -2499,27 +2500,30 @@ RunCommand(
     return (EFI_OUT_OF_RESOURCES);\r
   }\r
   TempWalker = CleanOriginal;\r
-  GetNextParameter(&TempWalker, &FirstParameter, StrSize(CleanOriginal));\r
-\r
-  //\r
-  // Depending on the first parameter we change the behavior\r
-  //\r
-  switch (Type = GetOperationType(FirstParameter)) {\r
-    case   File_Sys_Change:\r
-      Status = ChangeMappedDrive (FirstParameter);\r
-      break;\r
-    case   Internal_Command:\r
-    case   Script_File_Name:\r
-    case   Efi_Application:\r
-      Status = SetupAndRunCommandOrFile(Type, CleanOriginal, FirstParameter, ShellInfoObject.NewShellParametersProtocol);\r
-      break;\r
-    default:\r
-      //\r
-      // Whatever was typed, it was invalid.\r
-      //\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_NOT_FOUND), ShellInfoObject.HiiHandle, FirstParameter);\r
-      SetLastError(SHELL_NOT_FOUND);\r
-      break;\r
+  if (!EFI_ERROR(GetNextParameter(&TempWalker, &FirstParameter, StrSize(CleanOriginal)))) {\r
+    //\r
+    // Depending on the first parameter we change the behavior\r
+    //\r
+    switch (Type = GetOperationType(FirstParameter)) {\r
+      case   File_Sys_Change:\r
+        Status = ChangeMappedDrive (FirstParameter);\r
+        break;\r
+      case   Internal_Command:\r
+      case   Script_File_Name:\r
+      case   Efi_Application:\r
+        Status = SetupAndRunCommandOrFile(Type, CleanOriginal, FirstParameter, ShellInfoObject.NewShellParametersProtocol);\r
+        break;\r
+      default:\r
+        //\r
+        // Whatever was typed, it was invalid.\r
+        //\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_NOT_FOUND), ShellInfoObject.HiiHandle, FirstParameter);\r
+        SetLastError(SHELL_NOT_FOUND);\r
+        break;\r
+    }\r
+  } else {\r
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_NOT_FOUND), ShellInfoObject.HiiHandle, FirstParameter);\r
+    SetLastError(SHELL_NOT_FOUND);\r
   }\r
  \r
   SHELL_FREE_NON_NULL(CleanOriginal);\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 452c4c18d87537f415480ffb4897c093c98d8368..3f8652487570330c6cbf53ee2525e83ce591a4eb 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -4,7 +4,7 @@
 \r
   Copyright (C) 2014, Red Hat, Inc.\r
   Copyright (c) 2013 Hewlett-Packard Development Company, L.P.\r
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -18,7 +18,79 @@
 #include "Shell.h"\r
 \r
 /**\r
-  return the next parameter from a command line string;\r
+  Return the next location of a non-escaped character from a command line string;\r
+\r
+  @param[in] String        the string to parse\r
+  @param[in] Character     the character to look for\r
+\r
+  @retval the location of the character in the string or the end of the string\r
+**/\r
+CONST CHAR16*\r
+EFIAPI\r
+FindCharacter(\r
+  IN CONST CHAR16 *String,\r
+  IN CONST CHAR16 Character\r
+  )\r
+{\r
+  CONST CHAR16 *Walker;\r
+\r
+  for (Walker = String ; *Walker != Character && *Walker != CHAR_NULL; Walker++) {\r
+    if (*Walker == L'^') {\r
+      Walker++;\r
+    }\r
+  }\r
+  return Walker;\r
+}\r
+\r
+/**\r
+  Return the next parameter's end from a command line string;\r
+\r
+  @param[in] String        the string to parse\r
+**/\r
+CONST CHAR16*\r
+EFIAPI\r
+FindEndOfParameter(\r
+  IN CONST CHAR16 *String\r
+  )\r
+{\r
+  CONST CHAR16 *NextSpace;\r
+  CONST CHAR16 *NextQuote;\r
+  CONST CHAR16 *First;\r
+  CONST CHAR16 *CloseQuote;\r
+\r
+  NextSpace = FindCharacter (String, L' ' );\r
+  NextQuote = FindCharacter (String, L'\"');\r
+  First = MIN (NextQuote, NextSpace);\r
+\r
+  //\r
+  // nothing, all one parameter remaining\r
+  //\r
+  if (*First == CHAR_NULL) {\r
+    return (First);\r
+  }\r
+\r
+  //\r
+  // If space before a quote (or neither found, i.e. both CHAR_NULL),\r
+  // then that's the end.\r
+  //\r
+  if (First == NextSpace) {\r
+    return (NextSpace);\r
+  }\r
+\r
+  CloseQuote = FindCharacter (First+1, L'\"');\r
+\r
+  //\r
+  // We did not find a terminator... return the end of the string\r
+  //\r
+  if (*CloseQuote == CHAR_NULL) {\r
+    return (NULL);\r
+  }\r
+\r
+  return (FindEndOfParameter (CloseQuote+1));\r
+}\r
+\r
+/**\r
+  Return the next parameter from a command line string;\r
 \r
   This function moves the next parameter from Walker into TempParameter and moves\r
   Walker up past that parameter for recursive calling.  When the final parameter\r
@@ -27,12 +99,17 @@
   Temp Parameter must be large enough to hold the parameter before calling this\r
   function.\r
 \r
+  This will also remove all remaining ^ characters after processing.\r
+\r
   @param[in, out] Walker        pointer to string of command line.  Adjusted to\r
                                 reminaing command line on return\r
   @param[in, out] TempParameter pointer to string of command line item extracted.\r
   @param[in]      Length        buffer size of TempParameter.\r
+\r
+  @return   EFI_INALID_PARAMETER  A required parameter was NULL or pointed to a NULL or empty string.\r
+  @return   EFI_NOT_FOUND         A closing " could not be found on the specified string\r
 **/\r
-VOID\r
+EFI_STATUS\r
 EFIAPI\r
 GetNextParameter(\r
   IN OUT CHAR16   **Walker,\r
@@ -41,12 +118,15 @@ GetNextParameter(
   )\r
 {\r
   CHAR16 *NextDelim;\r
-  CHAR16 *TempLoc;\r
 \r
-  ASSERT(Walker           != NULL);\r
-  ASSERT(*Walker          != NULL);\r
-  ASSERT(TempParameter    != NULL);\r
-  ASSERT(*TempParameter   != NULL);\r
+  if (Walker           == NULL\r
+    ||*Walker          == NULL\r
+    ||TempParameter    == NULL\r
+    ||*TempParameter   == NULL\r
+    ){\r
+    return (EFI_INVALID_PARAMETER);\r
+  }\r
+\r
 \r
   //\r
   // make sure we dont have any leading spaces\r
@@ -59,81 +139,80 @@ GetNextParameter(
   // make sure we still have some params now...\r
   //\r
   if (StrLen(*Walker) == 0) {\r
-    ASSERT((*Walker)[0] == CHAR_NULL);\r
-    *Walker = NULL;\r
-    return;\r
+DEBUG_CODE_BEGIN();\r
+    *Walker        = NULL;\r
+DEBUG_CODE_END();\r
+    return (EFI_INVALID_PARAMETER);\r
+  }\r
+\r
+  NextDelim = (CHAR16*)FindEndOfParameter(*Walker);\r
+\r
+  if (NextDelim == NULL){\r
+DEBUG_CODE_BEGIN();\r
+    *Walker        = NULL;\r
+DEBUG_CODE_END();\r
+    return (EFI_NOT_FOUND);\r
   }\r
 \r
+  StrnCpy(*TempParameter, (*Walker), NextDelim - *Walker);\r
+\r
   //\r
-  // we have a quoted parameter\r
-  // could be the last parameter, but SHOULD have a trailing quote\r
+  // Add a CHAR_NULL if we didnt get one via the copy\r
   //\r
-  if ((*Walker)[0] == L'\"') {\r
-    NextDelim = NULL;\r
-    for (TempLoc = *Walker + 1 ; TempLoc != NULL && *TempLoc != CHAR_NULL ; TempLoc++) {\r
-      if (*TempLoc == L'^' && *(TempLoc+1) == L'\"') {\r
-        TempLoc++;\r
-      } else if (*TempLoc == L'\"') {\r
-        NextDelim = TempLoc;\r
-        break;\r
-      }\r
-    }\r
+  if (*NextDelim != CHAR_NULL) {\r
+    (*TempParameter)[NextDelim - *Walker] = CHAR_NULL;\r
+  }\r
 \r
-    if (NextDelim - ((*Walker)+1) == 0) {\r
-      //\r
-      // found ""\r
-      //\r
-      *(*TempParameter) = CHAR_NULL;\r
-      *Walker = NextDelim + 1;\r
-    } else if (NextDelim != NULL) {\r
+  *Walker = NextDelim;\r
 \r
-      //\r
-      // Copy ensuring that both quotes are left in place.\r
-      //\r
-      StrnCpy(*TempParameter, (*Walker), NextDelim - *Walker + 1);\r
-      *Walker = NextDelim + 1;\r
-    } else {\r
-      //\r
-      // last one... someone forgot the training quote!\r
-      //\r
-      StrnCpy(*TempParameter, *Walker, Length/sizeof(CHAR16) - 1);\r
-      *Walker = NULL;\r
-    }\r
-    for (TempLoc = *TempParameter ; TempLoc != NULL && *TempLoc != CHAR_NULL ; TempLoc++) {\r
-      if (*TempLoc == L'^' && *(TempLoc+1) == L'\"') {\r
-        CopyMem(TempLoc, TempLoc+1, StrSize(TempLoc) - sizeof(TempLoc[0]));\r
-      }\r
-    }\r
-  } else {\r
+  //\r
+  // Now remove any quotes surrounding entire parameters\r
+  //\r
+  if ((*TempParameter)[0] == L'\"' && (*TempParameter)[StrLen (*TempParameter)-1] == L'\"') {\r
+    (*TempParameter)[StrLen (*TempParameter)-1] = CHAR_NULL;\r
+    CopyMem ((*TempParameter), (*TempParameter)+1, StrSize ((*TempParameter)+1));\r
+  }\r
+\r
+  //\r
+  // Remove any non-escaped quotes in the string\r
+  //\r
+  for (NextDelim = StrStr(*TempParameter, L"\""); NextDelim != NULL && *NextDelim != CHAR_NULL; NextDelim = StrStr(NextDelim, L"\"")) {\r
+    //\r
+    // Make sure I found a quote character properly.\r
     //\r
-    // we have a regular parameter (no quote) OR\r
-    // we have the final parameter (no trailing space)\r
+    ASSERT(*NextDelim == L'\"');\r
+\r
     //\r
-    NextDelim = StrStr((*Walker), L" ");\r
-    if (NextDelim != NULL) {\r
-      StrnCpy(*TempParameter, *Walker, NextDelim - (*Walker));\r
-      (*TempParameter)[NextDelim - (*Walker)] = CHAR_NULL;\r
-      *Walker = NextDelim+1;\r
+    // Only remove quotes that do not have a preceeding ^\r
+    //\r
+    if ((NextDelim > (*TempParameter) && (*(NextDelim - 1) != L'^')) || (NextDelim == (*TempParameter))) {\r
+      CopyMem (NextDelim, NextDelim + 1, StrSize (NextDelim + 1));\r
     } else {\r
-      //\r
-      // last one.\r
-      //\r
-      StrnCpy(*TempParameter, *Walker, Length/sizeof(CHAR16) - 1);\r
-      *Walker = NULL;\r
-    }\r
-    for (NextDelim = *TempParameter ; NextDelim != NULL && *NextDelim != CHAR_NULL ; NextDelim++) {\r
-      if (*NextDelim == L'^' && *(NextDelim+1) == L'^') {\r
-        CopyMem(NextDelim, NextDelim+1, StrSize(NextDelim) - sizeof(NextDelim[0]));\r
-      }\r
-    }\r
-    while ((*TempParameter)[StrLen(*TempParameter)-1] == L' ') {\r
-      (*TempParameter)[StrLen(*TempParameter)-1] = CHAR_NULL;\r
+      NextDelim++;\r
     }\r
-    while ((*TempParameter)[0] == L' ') {\r
-      CopyMem(*TempParameter, (*TempParameter)+1, StrSize(*TempParameter) - sizeof((*TempParameter)[0]));\r
+  }\r
+\r
+  //\r
+  // Remove any escape charactersin the parameter before returning it\r
+  // all escape character processing is complete at this time\r
+  //\r
+  for (NextDelim = StrStr(*TempParameter, L"^"); NextDelim != NULL && *NextDelim != CHAR_NULL; NextDelim = StrStr(NextDelim, L"^")) {\r
+    //\r
+    // Make sure I found an escape character properly.\r
+    //\r
+    ASSERT(*NextDelim == L'^');\r
+\r
+    CopyMem (NextDelim, NextDelim + 1, StrSize (NextDelim + 1));\r
+\r
+    //\r
+    // If we had 2 escapes in a row, leave one behind\r
+    //\r
+    if (*NextDelim == L'^') {\r
+      NextDelim++;\r
     }\r
   }\r
-  return;\r
+\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -143,6 +222,9 @@ GetNextParameter(
   parameters for inclusion in EFI_SHELL_PARAMETERS_PROTOCOL.  this supports space\r
   delimited and quote surrounded parameter definition.\r
 \r
+  All special character processing (alias, environment variable, redirection, \r
+  etc... must be complete before calling this API.\r
+\r
   @param[in] CommandLine         String of command line to parse\r
   @param[in, out] Argv           pointer to array of strings; one for each parameter\r
   @param[in, out] Argc           pointer to number of strings in Argv array\r
@@ -182,9 +264,12 @@ ParseCommandLineToArgs(
   for ( Count = 0\r
       , Walker = (CHAR16*)CommandLine\r
       ; Walker != NULL && *Walker != CHAR_NULL\r
-      ; GetNextParameter(&Walker, &TempParameter, Size)\r
-      , Count++\r
-     );\r
+      ; Count++\r
+      ) {\r
+    if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size))) {\r
+      break;\r
+    }\r
+  }\r
 \r
   //\r
   // lets allocate the pointer array\r
@@ -199,7 +284,11 @@ ParseCommandLineToArgs(
   Walker = (CHAR16*)CommandLine;\r
   while(Walker != NULL && *Walker != CHAR_NULL) {\r
     SetMem16(TempParameter, Size, CHAR_NULL);\r
-    GetNextParameter(&Walker, &TempParameter, Size);\r
+    if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size))) {\r
+      SHELL_FREE_NON_NULL(TempParameter);\r
+      return (EFI_INVALID_PARAMETER);\r
+    }\r
+\r
     NewParam = AllocateCopyPool(StrSize(TempParameter), TempParameter);\r
     if (NewParam == NULL){\r
       SHELL_FREE_NON_NULL(TempParameter);\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h
index 15b76b76918605d03e6efc61beaa8e039cd485e4..2fd8f8c88b3318c91e39f1be597957f1d85288a8 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.h
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.h
@@ -192,8 +192,10 @@ ParseCommandLineToArgs(
   @param[in, out] TempParameter pointer to string of command line item extracted.\r
   @param[in]      Length        Length of (*TempParameter) in bytes\r
 \r
+  @return   EFI_INALID_PARAMETER  A required parameter was NULL or pointed to a NULL or empty string.\r
+  @return   EFI_NOT_FOUND         A closing " could not be found on the specified string\r
 **/\r
-VOID\r
+EFI_STATUS\r
 EFIAPI\r
 GetNextParameter(\r
   IN OUT CHAR16   **Walker,\r