From 7cc7022dfccadcae9e815d071916f96577e5df89 Mon Sep 17 00:00:00 2001
From: Jaben Carsey <Jaben.carsey@intel.com>
Date: Fri, 30 Jan 2015 16:29:20 +0000
Subject: ShellPkg: Refactor quote and escape search to use new function

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
Signed-off-by: Joe Peterson <joe.peterson@intel.com>
Reviewed-by: Shumin Qiu <shumin.qiu@intel.com>
Reviewed-by: Tapan Shah <tapandshah@hp.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16682 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Application/Shell/ShellParametersProtocol.c    | 97 ++++++----------------
 1 file changed, 24 insertions(+), 73 deletions(-)

(limited to 'ShellPkg')

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 3f86524875..d1a42dbd06 100644
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -17,31 +17,6 @@
 
 #include "Shell.h"
 
-/**
-  Return the next location of a non-escaped character from a command line string;
-
-  @param[in] String        the string to parse
-  @param[in] Character     the character to look for
-
-  @retval the location of the character in the string or the end of the string
-**/
-CONST CHAR16*
-EFIAPI
-FindCharacter(
-  IN CONST CHAR16 *String,
-  IN CONST CHAR16 Character
-  )
-{
-  CONST CHAR16 *Walker;
-
-  for (Walker = String ; *Walker != Character && *Walker != CHAR_NULL; Walker++) {
-    if (*Walker == L'^') {
-      Walker++;
-    }
-  }
-  return Walker;
-}
-
 /**
   Return the next parameter's end from a command line string;
 
@@ -53,14 +28,10 @@ FindEndOfParameter(
   IN CONST CHAR16 *String
   )
 {
-  CONST CHAR16 *NextSpace;
-  CONST CHAR16 *NextQuote;
   CONST CHAR16 *First;
   CONST CHAR16 *CloseQuote;
 
-  NextSpace = FindCharacter (String, L' ' );
-  NextQuote = FindCharacter (String, L'\"');
-  First = MIN (NextQuote, NextSpace);
+  First = FindFirstCharacter(String, L" \"", L'^');
 
   //
   // nothing, all one parameter remaining
@@ -73,14 +44,14 @@ FindEndOfParameter(
   // If space before a quote (or neither found, i.e. both CHAR_NULL),
   // then that's the end.
   //
-  if (First == NextSpace) {
-    return (NextSpace);
+  if (*First == L' ') {
+    return (First);
   }
 
-  CloseQuote = FindCharacter (First+1, L'\"');
+  CloseQuote = FindFirstCharacter (First+1, L"\"", L'^');
 
   //
-  // We did not find a terminator... return the end of the string
+  // We did not find a terminator...
   //
   if (*CloseQuote == CHAR_NULL) {
     return (NULL);
@@ -117,7 +88,7 @@ GetNextParameter(
   IN CONST UINTN  Length
   )
 {
-  CHAR16 *NextDelim;
+  CONST CHAR16 *NextDelim;
 
   if (Walker           == NULL
     ||*Walker          == NULL
@@ -145,7 +116,7 @@ DEBUG_CODE_END();
     return (EFI_INVALID_PARAMETER);
   }
 
-  NextDelim = (CHAR16*)FindEndOfParameter(*Walker);
+  NextDelim = FindEndOfParameter(*Walker);
 
   if (NextDelim == NULL){
 DEBUG_CODE_BEGIN();
@@ -163,52 +134,32 @@ DEBUG_CODE_END();
     (*TempParameter)[NextDelim - *Walker] = CHAR_NULL;
   }
 
-  *Walker = NextDelim;
-
   //
-  // Now remove any quotes surrounding entire parameters
+  // Update Walker for the next iteration through the function
   //
-  if ((*TempParameter)[0] == L'\"' && (*TempParameter)[StrLen (*TempParameter)-1] == L'\"') {
-    (*TempParameter)[StrLen (*TempParameter)-1] = CHAR_NULL;
-    CopyMem ((*TempParameter), (*TempParameter)+1, StrSize ((*TempParameter)+1));
-  }
+  *Walker = (CHAR16*)NextDelim;
 
   //
   // Remove any non-escaped quotes in the string
+  // Remove any remaining escape characters in the string
   //
-  for (NextDelim = StrStr(*TempParameter, L"\""); NextDelim != NULL && *NextDelim != CHAR_NULL; NextDelim = StrStr(NextDelim, L"\"")) {
-    //
-    // Make sure I found a quote character properly.
-    //
-    ASSERT(*NextDelim == L'\"');
+  for (NextDelim = FindFirstCharacter(*TempParameter, L"\"^", CHAR_NULL) 
+    ; *NextDelim != CHAR_NULL 
+    ; NextDelim = FindFirstCharacter(NextDelim, L"\"^", CHAR_NULL)
+    ) {
+    if (*NextDelim == L'^') {
 
-    //
-    // Only remove quotes that do not have a preceeding ^
-    //
-    if ((NextDelim > (*TempParameter) && (*(NextDelim - 1) != L'^')) || (NextDelim == (*TempParameter))) {
-      CopyMem (NextDelim, NextDelim + 1, StrSize (NextDelim + 1));
-    } else {
+      //
+      // eliminate the escape ^
+      //
+      CopyMem ((CHAR16*)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));
       NextDelim++;
-    }
-  }
+    } else if (*NextDelim == L'\"') {
 
-  //
-  // Remove any escape charactersin the parameter before returning it
-  // all escape character processing is complete at this time
-  //
-  for (NextDelim = StrStr(*TempParameter, L"^"); NextDelim != NULL && *NextDelim != CHAR_NULL; NextDelim = StrStr(NextDelim, L"^")) {
-    //
-    // Make sure I found an escape character properly.
-    //
-    ASSERT(*NextDelim == L'^');
-
-    CopyMem (NextDelim, NextDelim + 1, StrSize (NextDelim + 1));
-
-    //
-    // If we had 2 escapes in a row, leave one behind
-    //
-    if (*NextDelim == L'^') {
-      NextDelim++;
+      //
+      // eliminate the unescaped quote
+      //
+      CopyMem ((CHAR16*)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));
     }
   }
 
-- 
cgit v1.2.3