Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103777

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• ShellPkg/Application/Shell/ConsoleWrappers.c (modified) (10 diffs)
• ShellPkg/Application/Shell/ConsoleWrappers.h (modified) (4 diffs)
• ShellPkg/Application/Shell/FileHandleWrappers.c (modified) (34 diffs)
• ShellPkg/Application/Shell/Shell.c (modified) (24 diffs)
• ShellPkg/Application/Shell/Shell.uni (modified) (1 prop) ( previous)
• ShellPkg/Application/Shell/ShellEnvVar.c (modified) (3 diffs)
• ShellPkg/Application/Shell/ShellParametersProtocol.c (modified) (12 diffs)
• ShellPkg/Application/Shell/ShellProtocol.c (modified) (16 diffs)
• ShellPkg/Application/Shell/ShellProtocol.h (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ConsoleWrappers.c

@@ -116 +116 @@
 
 /**
-  Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
+  Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting input from a file.
 
@@ -156 +156 @@
   ProtocolToReturn->SimpleTextIn.Reset         = FileBasedSimpleTextInReset;
   ProtocolToReturn->SimpleTextIn.ReadKeyStroke = FileBasedSimpleTextInReadKeyStroke;
-  
+
   Status = gBS->CreateEvent (
                   EVT_NOTIFY_WAIT,
@@ -171 +171 @@
   ///@todo possibly also install SimpleTextInputEx on the handle at this point.
   Status = gBS->InstallProtocolInterface(
-    &(ProtocolToReturn->TheHandle), 
-    &gEfiSimpleTextInProtocolGuid, 
-    EFI_NATIVE_INTERFACE, 
+    &(ProtocolToReturn->TheHandle),
+    &gEfiSimpleTextInProtocolGuid,
+    EFI_NATIVE_INTERFACE,
     &(ProtocolToReturn->SimpleTextIn));
   if (!EFI_ERROR(Status)) {
@@ -185 +185 @@
 
 /**
-  Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
+  Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting input from a file.
 
@@ -208 +208 @@
 
   Status1 = gBS->UninstallProtocolInterface(
-    ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL*)SimpleTextIn)->TheHandle, 
-    &gEfiSimpleTextInProtocolGuid, 
+    ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL*)SimpleTextIn)->TheHandle,
+    &gEfiSimpleTextInProtocolGuid,
     &(((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL*)SimpleTextIn)->SimpleTextIn));
 
@@ -278 +278 @@
 {
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *PassThruProtocol;
-  
+
   PassThruProtocol = ((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *)This)->OriginalSimpleTextOut;
-  
+
   // Pass the QueryMode call thru to the original SimpleTextOutProtocol
   return (PassThruProtocol->QueryMode(
@@ -416 +416 @@
 
 /**
-  Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
+  Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting output from a file.
 
@@ -469 +469 @@
 
   Status = gBS->InstallProtocolInterface(
-    &(ProtocolToReturn->TheHandle), 
-    &gEfiSimpleTextOutProtocolGuid, 
-    EFI_NATIVE_INTERFACE, 
+    &(ProtocolToReturn->TheHandle),
+    &gEfiSimpleTextOutProtocolGuid,
+    EFI_NATIVE_INTERFACE,
     &(ProtocolToReturn->SimpleTextOut));
   if (!EFI_ERROR(Status)) {
@@ -483 +483 @@
 
 /**
-  Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
+  Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting output from a file.
 
@@ -501 +501 @@
   }
   Status = gBS->UninstallProtocolInterface(
-    ((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->TheHandle, 
-    &gEfiSimpleTextOutProtocolGuid, 
+    ((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->TheHandle,
+    &gEfiSimpleTextOutProtocolGuid,
     &(((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->SimpleTextOut));
   FreePool(SimpleTextOut);

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ConsoleWrappers.h

@@ -18 +18 @@
 
 /**
-  Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
+  Function to create a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting input from a file.
 
@@ -35 +35 @@
 
 /**
-  Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a 
+  Function to close a EFI_SIMPLE_TEXT_INPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting input from a file.
 
@@ -49 +49 @@
 
 /**
-  Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
+  Function to create a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting output from a file.
 
@@ -68 +68 @@
 
 /**
-  Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a 
+  Function to close a EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL on top of a
   SHELL_FILE_HANDLE to support redirecting output from a file.
 

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/FileHandleWrappers.c

@@ -19 +19 @@
 
 /**
-  File style interface for console (Open).  
-  
+  File style interface for console (Open).
+
   @param[in] This       Ignored.
   @param[out] NewHandle Ignored.
@@ -26 +26 @@
   @param[in] OpenMode   Ignored.
   @param[in] Attributes Ignored.
-  
+
   @retval EFI_NOT_FOUND
 **/
@@ -44 +44 @@
 /**
   File style interface for console (Close, Delete, & Flush)
-  
+
   @param[in] This       Ignored.
-  
+
   @retval EFI_SUCCESS
 **/
@@ -63 +63 @@
   @param[in] This       Ignored.
   @param[out] Position  Ignored.
-  
+
   @retval EFI_UNSUPPORTED
 **/
@@ -78 +78 @@
 /**
   File style interface for console (SetPosition).
-  
+
   @param[in] This       Ignored.
   @param[in] Position   Ignored.
-  
+
   @retval EFI_UNSUPPORTED
 **/
@@ -96 +96 @@
 /**
   File style interface for console (GetInfo).
-  
+
   @param[in] This              Ignored.
   @param[in] InformationType   Ignored.
   @param[in, out] BufferSize   Ignored.
   @param[out] Buffer           Ignored.
-  
+
   @retval EFI_UNSUPPORTED
 **/
@@ -118 +118 @@
 /**
   File style interface for console (SetInfo).
-  
+
   @param[in] This       Ignored.
   @param[in] InformationType   Ignored.
   @param[in] BufferSize Ignored.
   @param[in] Buffer     Ignored.
-  
+
   @retval EFI_UNSUPPORTED
 **/
@@ -142 +142 @@
 
   Writes data to the screen.
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to write.
-  
+
   @retval EFI_UNSUPPORTED No output console is supported.
   @return A return value from gST->ConOut->OutputString.
@@ -167 +167 @@
 /**
   File style interface for StdIn (Write).
-  
+
   @param[in] This            Ignored.
   @param[in, out] BufferSize Ignored.
   @param[in] Buffer          Ignored.
-  
+
   @retval EFI_UNSUPPORTED
 **/
@@ -189 +189 @@
 
   Writes error to the error output.
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to write.
-  
+
   @return A return value from gST->StdErr->OutputString.
 **/
@@ -209 +209 @@
 /**
   File style interface for console StdOut (Read).
-  
+
   @param[in] This              Ignored.
   @param[in, out] BufferSize   Ignored.
   @param[out] Buffer           Ignored.
-  
+
   @retval EFI_UNSUPPORTED
 **/
@@ -229 +229 @@
 /**
   File style interface for console StdErr (Read).
-  
+
   @param[in] This              Ignored.
   @param[in, out] BufferSize   Ignored.
   @param[out] Buffer           Ignored.
-  
+
   @retval EFI_UNSUPPORTED Always.
 **/
@@ -249 +249 @@
 /**
   File style interface for NUL file (Read).
-  
+
   @param[in] This              Ignored.
   @param[in, out] BufferSize   Poiner to 0 upon return.
   @param[out] Buffer           Ignored.
-  
+
   @retval EFI_SUCCESS Always.
 **/
@@ -270 +270 @@
 /**
   File style interface for NUL file (Write).
-  
+
   @param[in] This              Ignored.
   @param[in, out] BufferSize   Ignored.
   @param[in] Buffer            Ignored.
-  
+
   @retval EFI_SUCCESS
 **/
@@ -940 +940 @@
 
   Frees the memory for this object.
-  
+
   @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
-  
+
   @retval EFI_SUCCESS
 **/
@@ -956 +956 @@
 
   //
-  // Most if not all UEFI commands will have an '\r\n' at the end of any output. 
-  // Since the output was redirected to a variable, it does not make sense to 
+  // Most if not all UEFI commands will have an '\r\n' at the end of any output.
+  // Since the output was redirected to a variable, it does not make sense to
   // keep this.  So, before closing, strip the trailing '\r\n' from the variable
   // if it exists.
@@ -969 +969 @@
     if (NewBuffer == NULL) {
       return EFI_OUT_OF_RESOURCES;
-    }  
+    }
     Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
   }
-  
+
   if (!EFI_ERROR(Status) && NewBuffer != NULL) {
-    
+
     if (StrSize(NewBuffer) > 6)
     {
-      if ((((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 2] == CHAR_LINEFEED) 
+      if ((((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 2] == CHAR_LINEFEED)
            && (((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 3] == CHAR_CARRIAGE_RETURN)) {
-        ((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 3] = CHAR_NULL;   
+        ((CHAR16*)NewBuffer)[(StrSize(NewBuffer)/2) - 3] = CHAR_NULL;
       }
-    
+
       if (IsVolatileEnv(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name)) {
         Status = SHELL_SET_ENVIRONMENT_VARIABLE_V(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, StrSize(NewBuffer), NewBuffer);
@@ -988 +988 @@
       }
     }
-  } 
-  
+  }
+
   SHELL_FREE_NON_NULL(NewBuffer);
   FreePool((EFI_FILE_PROTOCOL_ENVIRONMENT*)This);
@@ -997 +997 @@
 /**
   File style interface for Environment Variable (Delete).
-  
+
   @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
-  
+
   @retval The return value from FileInterfaceEnvClose().
 **/
@@ -1014 +1014 @@
 /**
   File style interface for Environment Variable (Read).
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[out] Buffer           The pointer to the buffer to fill.
-  
+
   @retval EFI_SUCCESS   The data was read.
 **/
@@ -1037 +1037 @@
 /**
   File style interface for Volatile Environment Variable (Write).
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to write.
-  
+
   @retval EFI_SUCCESS   The data was read.
 **/
@@ -1084 +1084 @@
 /**
   File style interface for Non Volatile Environment Variable (Write).
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to write.
-  
+
   @retval EFI_SUCCESS   The data was read.
 **/
@@ -1169 +1169 @@
   EnvFileInterface->Delete      = FileInterfaceEnvDelete;
   EnvFileInterface->Read        = FileInterfaceEnvRead;
-  
+
   CopyMem(EnvFileInterface->Name, EnvName, EnvNameSize);
 
@@ -1322 +1322 @@
 /**
   File style interface for Mem (SetPosition).
-  
+
   @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
   @param[out] Position  The position to set.
-  
+
   @retval EFI_SUCCESS             The position was successfully changed.
   @retval EFI_INVALID_PARAMETER   The Position was invalid.
@@ -1346 +1346 @@
 /**
   File style interface for Mem (GetPosition).
-  
+
   @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
   @param[out] Position  The pointer to the position.
-  
+
   @retval EFI_SUCCESS   The position was retrieved.
-**/ 
+**/
 EFI_STATUS
 EFIAPI
@@ -1365 +1365 @@
 /**
   File style interface for Mem (Write).
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to write.
-  
+
   @retval EFI_OUT_OF_RESOURCES The operation failed due to lack of resources.
   @retval EFI_SUCCESS          The data was written.
@@ -1415 +1415 @@
 /**
   File style interface for Mem (Read).
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to fill.
-  
+
   @retval EFI_SUCCESS   The data was read.
 **/
@@ -1442 +1442 @@
 
   Frees all memory associated with this object.
-  
+
   @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
-  
+
   @retval EFI_SUCCESS   The 'file' was closed.
-**/ 
+**/
 EFI_STATUS
 EFIAPI
@@ -1527 +1527 @@
   @param  This            Protocol instance pointer.
   @param  Position        Byte position from the start of the file.
-                          
+
   @retval EFI_SUCCESS     Data was written.
   @retval EFI_UNSUPPORTED Seek request for non-zero is not valid on open.
@@ -1547 +1547 @@
   @param  This            Protocol instance pointer.
   @param  Position        Byte position from the start of the file.
-                          
+
   @retval EFI_SUCCESS     Data was written.
   @retval EFI_UNSUPPORTED Seek request for non-zero is not valid on open..
@@ -1723 +1723 @@
 
   @param  This                     Protocol instance pointer.
-                                   
+
   @retval EFI_SUCCESS              The device was opened.
   @retval EFI_WARN_DELETE_FAILURE  The handle was closed but the file was not deleted.
@@ -1742 +1742 @@
 /**
   File style interface for File (Close).
-  
+
   @param[in] This       The pointer to the EFI_FILE_PROTOCOL object.
-  
+
   @retval EFI_SUCCESS   The file was closed.
 **/
@@ -1762 +1762 @@
   File style interface for File (Write).
 
-  If the file was opened with ASCII mode the data will be processed through 
+  If the file was opened with ASCII mode the data will be processed through
   AsciiSPrint before writing.
-  
+
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
   @param[in, out] BufferSize   Size in bytes of Buffer.
   @param[in] Buffer            The pointer to the buffer to write.
-  
+
   @retval EFI_SUCCESS   The data was written.
 **/
@@ -1805 +1805 @@
   This will create a new EFI_FILE_PROTOCOL identical to the Templace
   except that the new one has Unicode and Ascii knowledge.
-  
+
   @param[in] Template   A pointer to the EFI_FILE_PROTOCOL object.
   @param[in] Unicode    TRUE for UCS-2, FALSE for ASCII.
-  
+
   @return a new EFI_FILE_PROTOCOL object to be used instead of the template.
 **/

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/Shell.c

@@ -102 +102 @@
 
 /**
-  Parse for the next instance of one string within another string. Can optionally make sure that 
+  Parse for the next instance of one string within another string. Can optionally make sure that
   the string was not escaped (^ character) per the shell specification.
 
@@ -159 +159 @@
 {
   CONST CHAR16    *Walker;
-  
+
   Walker = NULL;
 
@@ -165 +165 @@
   ASSERT (EndPercent != NULL);
   ASSERT (BeginPercent < EndPercent);
-  
+
   if ((BeginPercent + 1) == EndPercent) {
     return FALSE;
@@ -212 +212 @@
   TempSpot      = FindFirstCharacter(CmdLine, L"|", L'^');
 
-  if (FirstQuote == NULL    || 
-      TempSpot == NULL      || 
-      TempSpot == CHAR_NULL || 
+  if (FirstQuote == NULL    ||
+      TempSpot == NULL      ||
+      TempSpot == CHAR_NULL ||
       FirstQuote > TempSpot
       ) {
@@ -223 +223 @@
     if (FirstQuote == NULL || FirstQuote > TempSpot) {
       break;
-    }    
+    }
     SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE);
     if (SecondQuote == NULL) {
@@ -235 +235 @@
       TempSpot = FindFirstCharacter(TempSpot + 1, L"|", L'^');
       continue;
-    } 
-  }
-  
+    }
+  }
+
   return (BOOLEAN) ((TempSpot != NULL) && (*TempSpot != CHAR_NULL));
 }
 
 /**
-  Function to start monitoring for CTRL-S using SimpleTextInputEx.  This 
+  Function to start monitoring for CTRL-S using SimpleTextInputEx.  This
   feature's enabled state was not known when the shell initially launched.
 
@@ -267 +267 @@
   if (EFI_ERROR(Status)) {
     ShellPrintHiiEx(
-      -1, 
-      -1, 
+      -1,
+      -1,
       NULL,
       STRING_TOKEN (STR_SHELL_NO_IN_EX),
@@ -285 +285 @@
     NotificationFunction,
     &ShellInfoObject.CtrlSNotifyHandle1);
-  
+
   KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
   if (!EFI_ERROR(Status)) {
@@ -303 +303 @@
       NotificationFunction,
       &ShellInfoObject.CtrlSNotifyHandle3);
-  }  
+  }
   KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
   if (!EFI_ERROR(Status)) {
@@ -1374 +1374 @@
       continue;
     }
-    
+
     if (FirstQuote == NULL || SecondPercent < FirstQuote) {
       if (IsValidEnvironmentVariableName(FirstPercent, SecondPercent)) {
@@ -1515 +1515 @@
   ShellCopySearchAndReplace(NewCommandLine1, NewCommandLine2, NewSize, L"^%", L"%", TRUE, FALSE);
   StrnCpy(NewCommandLine1, NewCommandLine2, NewSize/sizeof(CHAR16)-1);
-  
+
   FreePool(NewCommandLine2);
   FreePool(ItemTemp);
@@ -1633 +1633 @@
 
 /**
-  Take the original command line, substitute any variables, free 
+  Take the original command line, substitute any variables, free
   the original string, return the modified copy.
 
@@ -1658 +1658 @@
 
 /**
-  Take the original command line, substitute any alias in the first group of space delimited characters, free 
+  Take the original command line, substitute any alias in the first group of space delimited characters, free
   the original string, return the modified copy.
 
@@ -1718 +1718 @@
   SHELL_FREE_NON_NULL(*CmdLine);
   SHELL_FREE_NON_NULL(CommandName);
- 
+
   //
   // re-assign the passed in double pointer to point to our newly allocated buffer
@@ -1731 +1731 @@
 
   @param[in] CmdName  pointer to the command line to update.
-  
+
   @retval Internal_Command    The name is an internal command.
   @retval File_Sys_Change     the name is a file system change.
@@ -1760 +1760 @@
   //
   if (CmdName[(StrLen(CmdName)-1)] == L':') {
-    if ( StrStr(CmdName, L" ") != NULL 
+    if ( StrStr(CmdName, L" ") != NULL
       || StrLen(StrStr(CmdName, L":")) > 1
       ) {
@@ -1790 +1790 @@
     return (Efi_Application);
   }
-  
+
   SHELL_FREE_NON_NULL(FileWithPath);
   //
@@ -1807 +1807 @@
   @retval EFI_NOT_FOUND         The operation type is unknown or invalid.
 **/
-EFI_STATUS 
+EFI_STATUS
 EFIAPI
 IsValidSplit(
@@ -1959 +1959 @@
   //
   ASSERT(CmdLine[(StrLen(CmdLine)-1)] == L':' && StrStr(CmdLine, L" ") == NULL);
-  
+
   //
   // Call the protocol API to do the work
@@ -2107 +2107 @@
 
   This API will upadate the shell's environment since these commands are libraries.
-  
+
   @param[in] CmdLine          the command line to run.
   @param[in] FirstParameter   the first parameter on the command line
@@ -2129 +2129 @@
   BOOLEAN                   LastError;
   CHAR16                    *Walker;
-  CHAR16                    *NewCmdLine;  
+  CHAR16                    *NewCmdLine;
 
   NewCmdLine = AllocateCopyPool (StrSize (CmdLine), CmdLine);
@@ -2389 +2389 @@
   Function will process and run a command line.
 
-  This will determine if the command line represents an internal shell 
+  This will determine if the command line represents an internal shell
   command or dispatch an external application.
 
@@ -2463 +2463 @@
     SHELL_FREE_NON_NULL(CleanOriginal);
     return (Status);
-  } 
+  }
 
   //
@@ -2499 +2499 @@
     SetLastError(SHELL_NOT_FOUND);
   }
- 
+
   SHELL_FREE_NON_NULL(CleanOriginal);
   SHELL_FREE_NON_NULL(FirstParameter);

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellEnvVar.c

@@ -139 +139 @@
     return (EFI_INVALID_PARAMETER);
   }
-  
+
   Status = EFI_SUCCESS;
-  
+
   ValBufferSize = INIT_DATA_BUFFER_SIZE;
   NameBufferSize = INIT_NAME_BUFFER_SIZE;
@@ -167 +167 @@
       Status = gRT->GetNextVariableName(&NameSize, VariableName, &Guid);
     }
-    
+
     if (!EFI_ERROR(Status) && CompareGuid(&Guid, &gShellVariableGuid)){
       VarList = AllocateZeroPool(sizeof(ENV_VAR_LIST));
@@ -190 +190 @@
             break;
           }
-          
+
           ValSize = ValBufferSize;
           Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(VariableName, &VarList->Atts, &ValSize, VarList->Val);

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellParametersProtocol.c

@@ -144 +144 @@
   // Remove any remaining escape characters in the string
   //
-  for (NextDelim = FindFirstCharacter(*TempParameter, L"\"^", CHAR_NULL) 
-    ; *NextDelim != CHAR_NULL 
+  for (NextDelim = FindFirstCharacter(*TempParameter, L"\"^", CHAR_NULL)
+    ; *NextDelim != CHAR_NULL
     ; NextDelim = FindFirstCharacter(NextDelim, L"\"^", CHAR_NULL)
     ) {
@@ -174 +174 @@
   delimited and quote surrounded parameter definition.
 
-  All special character processing (alias, environment variable, redirection, 
+  All special character processing (alias, environment variable, redirection,
   etc... must be complete before calling this API.
 
@@ -483 +483 @@
   gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);
   gEfiShellProtocol->CloseFile(Handle);
-  return (Status);  
+  return (Status);
 }
 
@@ -562 +562 @@
     if ((TempLocation = StrStr(Copy , L"\"")) != NULL) {
       TempLocation[0] = CHAR_NULL;
-    }    
+    }
   } else {
     Copy = FileName;
@@ -570 +570 @@
     if ((TempLocation = StrStr(Copy , L" ")) != NULL) {
       TempLocation[0] = CHAR_NULL;
-    }    
+    }
   }
 
@@ -603 +603 @@
     if ((TempLocation = StrStr(Copy , L"%")) != NULL) {
       TempLocation[0] = CHAR_NULL;
-    }    
+    }
   }
 
@@ -612 +612 @@
   Remove the unicode file tag from the begining of the file buffer since that will not be
   used by StdIn.
-  
+
   @param[in]  Handle    Pointer to the handle of the file to be processed.
-  
+
   @retval EFI_SUCCESS   The unicode file tag has been moved successfully.
 **/
@@ -820 +820 @@
       Status = EFI_NOT_FOUND;
     }
-  } 
+  }
   if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >> ")) != NULL) {
     FirstLocation = MIN(CommandLineWalker, FirstLocation);
@@ -847 +847 @@
       Status = EFI_NOT_FOUND;
     }
-  } 
+  }
   if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>a ")) != NULL) {
     FirstLocation = MIN(CommandLineWalker, FirstLocation);
@@ -861 +861 @@
       Status = EFI_NOT_FOUND;
     }
-  } 
+  }
   if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >a ")) != NULL) {
     FirstLocation = MIN(CommandLineWalker, FirstLocation);
@@ -1089 +1089 @@
       // Cant redirect during a reconnect operation.
       //
-      ||(StrStr(NewCommandLine, L"connect -r") != NULL 
+      ||(StrStr(NewCommandLine, L"connect -r") != NULL
          && (StdOutVarName != NULL || StdOutFileName != NULL || StdErrFileName != NULL || StdErrVarName != NULL))
       //
@@ -1295 +1295 @@
   SPLIT_LIST        *Split;
 
-  if (ShellParameters == NULL 
+  if (ShellParameters == NULL
     ||OldStdIn        == NULL
     ||OldStdOut       == NULL

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellProtocol.c

@@ -1172 +1172 @@
 **/
 EFI_STATUS
-EFIAPI 
+EFIAPI
 EfiShellRegisterGuidName(
   IN CONST EFI_GUID *Guid,
@@ -1402 +1402 @@
                                 environment variable name and y is the value. If this
                                 is NULL, then the current shell environment is used.
-                            
+
   @param[out] StartImageStatus  Returned status from gBS->StartImage.
 
@@ -1440 +1440 @@
 
   NewHandle = NULL;
-  
+
   NewCmdLine = AllocateCopyPool (StrSize (CommandLine), CommandLine);
   if (NewCmdLine == NULL) {
@@ -2047 +2047 @@
 **/
 EFI_STATUS
-EFIAPI 
+EFIAPI
 EfiShellGetGuidFromName(
   IN  CONST CHAR16   *GuidName,
@@ -2059 +2059 @@
     return (EFI_INVALID_PARAMETER);
   }
- 
+
   Status = GetGuidFromStringName(GuidName, NULL, &NewGuid);
 
@@ -2087 +2087 @@
 **/
 EFI_STATUS
-EFIAPI 
+EFIAPI
 EfiShellGetGuidName(
   IN  CONST EFI_GUID *Guid,
@@ -2563 +2563 @@
 **/
 CONST CHAR16 *
-EFIAPI 
+EFIAPI
 EfiShellGetEnvEx(
   IN  CONST CHAR16 *Name,
@@ -3105 +3105 @@
   )
 {
-  
+
   EFI_STATUS        Status;
   EFI_GUID          Guid;
@@ -3140 +3140 @@
         break;
       }
-      
+
       NameSize = NameBufferSize;
       Status = gRT->GetNextVariableName(&NameSize, VariableName, &Guid);
     }
-    
+
     if (EFI_ERROR (Status)) {
       SHELL_FREE_NON_NULL(RetVal);
@@ -3150 +3150 @@
       break;
     }
-    
+
     if (CompareGuid(&Guid, &gShellAliasGuid)){
       ASSERT((RetVal == NULL && RetSize == 0) || (RetVal != NULL));
@@ -3165 +3165 @@
   Convert a null-terminated unicode string, in-place, to all lowercase.
   Then return it.
-  
+
   @param  Str    The null-terminated string to be converted to all lowercase.
-  
-  @return        The null-terminated string converted into all lowercase.  
+
+  @return        The null-terminated string converted into all lowercase.
 **/
 CHAR16 *
@@ -3628 +3628 @@
         (KeyData->KeyState.KeyShiftState == (EFI_SHIFT_STATE_VALID|EFI_LEFT_CONTROL_PRESSED) || KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED))) ||
       (KeyData->Key.UnicodeChar == 3)
-      ){ 
+      ){
     if (ShellInfoObject.NewEfiShellProtocol->ExecutionBreak == NULL) {
       return (EFI_UNSUPPORTED);
@@ -3635 +3635 @@
   } else if  ((KeyData->Key.UnicodeChar == L's') &&
               (KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_LEFT_CONTROL_PRESSED) || KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED))
-              ){ 
+              ){
     ShellInfoObject.HaltOutput = TRUE;
   }
@@ -3642 +3642 @@
 
 /**
-  Function to start monitoring for CTRL-C using SimpleTextInputEx.  This 
+  Function to start monitoring for CTRL-C using SimpleTextInputEx.  This
   feature's enabled state was not known when the shell initially launched.
 
@@ -3667 +3667 @@
   if (EFI_ERROR(Status)) {
     ShellPrintHiiEx(
-      -1, 
-      -1, 
+      -1,
+      -1,
       NULL,
       STRING_TOKEN (STR_SHELL_NO_IN_EX),
@@ -3689 +3689 @@
     NotificationFunction,
     &ShellInfoObject.CtrlCNotifyHandle1);
-  
+
   KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
   if (!EFI_ERROR(Status)) {

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Application/Shell/ShellProtocol.h

@@ -37 +37 @@
   This must be removed via calling CleanUpShellProtocol().
 
-  @param[in, out] NewShell   The pointer to the pointer to the structure 
+  @param[in, out] NewShell   The pointer to the pointer to the structure
   to install.
 
@@ -50 +50 @@
 
 /**
-  Opposite of CreatePopulateInstallShellProtocol.  
+  Opposite of CreatePopulateInstallShellProtocol.
 
   Free all memory and restore the system to the state it was in before calling
@@ -915 +915 @@
 
 /**
-  Function to start monitoring for CTRL-C using SimpleTextInputEx.  This 
+  Function to start monitoring for CTRL-C using SimpleTextInputEx.  This
   feature's enabled state was not known when the shell initially launched.