Changeset 77662 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application

Timestamp:

Mar 12, 2019 12:40:12 PM (6 years ago)

Author:

vboxsync

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

129295

Message:

EFI: First step in UDK2018 merge. Does not build yet.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Application/Shell/ConsoleLogger.c (modified) (17 diffs)
• ShellPkg/Application/Shell/ConsoleLogger.h (modified) (6 diffs)
• ShellPkg/Application/Shell/ConsoleWrappers.c (modified) (10 diffs)
• ShellPkg/Application/Shell/ConsoleWrappers.h (modified) (5 diffs)
• ShellPkg/Application/Shell/FileHandleInternal.h (modified) (3 diffs)
• ShellPkg/Application/Shell/FileHandleWrappers.c (modified) (41 diffs)
• ShellPkg/Application/Shell/FileHandleWrappers.h (modified) (2 diffs)
• ShellPkg/Application/Shell/Shell.c (modified) (115 diffs)
• ShellPkg/Application/Shell/Shell.h (modified) (25 diffs)
• ShellPkg/Application/Shell/Shell.inf (modified) (4 diffs)
• ShellPkg/Application/Shell/Shell.uni (modified) (4 diffs)
• ShellPkg/Application/Shell/ShellEnvVar.c (modified) (14 diffs)
• ShellPkg/Application/Shell/ShellEnvVar.h (modified) (6 diffs)
• ShellPkg/Application/Shell/ShellManParser.c (modified) (18 diffs)
• ShellPkg/Application/Shell/ShellManParser.h (modified) (2 diffs)
• ShellPkg/Application/Shell/ShellParametersProtocol.c (modified) (33 diffs)
• ShellPkg/Application/Shell/ShellParametersProtocol.h (modified) (12 diffs)
• ShellPkg/Application/Shell/ShellProtocol.c (modified) (66 diffs)
• ShellPkg/Application/Shell/ShellProtocol.h (modified) (11 diffs)
• ShellPkg/Application/ShellCTestApp/README.txt (added)
• ShellPkg/Application/ShellCTestApp/ShellCTestApp.c (modified) (2 diffs)
• ShellPkg/Application/ShellCTestApp/TestArgv.log (added)
• ShellPkg/Application/ShellCTestApp/TestArgv.nsh (added)
• ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ConsoleLogger.c

@@ -2 +2 @@
   Provides interface to shell console logger.
 
-  Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2016 Hewlett-Packard Development Company, L.P.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -29 +30 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerInstall(
   IN CONST UINTN ScreensToSave,
@@ -92 +92 @@
   gST->ConOut           = &(*ConsoleInfo)->OurConOut;
 
+  //
+  // Update the CRC32 in the EFI System Table header
+  //
+  gST->Hdr.CRC32 = 0;
+  gBS->CalculateCrc32 (
+        (UINT8 *)&gST->Hdr,
+        gST->Hdr.HeaderSize,
+        &gST->Hdr.CRC32
+        );
   return (Status);
 }
@@ -105 +114 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerUninstall(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -127 +135 @@
   gST->ConOut = ConsoleInfo->OldConOut;
 
+  //
+  // Update the CRC32 in the EFI System Table header
+  //
+  gST->Hdr.CRC32 = 0;
+  gBS->CalculateCrc32 (
+        (UINT8 *)&gST->Hdr,
+        gST->Hdr.HeaderSize,
+        &gST->Hdr.CRC32
+        );
+
   return (gBS->UninstallProtocolInterface(gImageHandle, &gEfiSimpleTextOutProtocolGuid, (VOID*)&ConsoleInfo->OurConOut));
 }
@@ -143 +161 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerDisplayHistory(
   IN CONST BOOLEAN  Forward,
@@ -219 +236 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerStopHistory(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -228 +244 @@
     return (EFI_SUCCESS);
   }
+
+  //
+  // Clear the screen
+  //
+  ConsoleInfo->OldConOut->ClearScreen(ConsoleInfo->OldConOut);
+
   ConsoleInfo->CurrentStartRow = ConsoleInfo->OriginalStartRow;
   return (UpdateDisplayFromHistory(ConsoleInfo));
@@ -240 +262 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateDisplayFromHistory(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -302 +323 @@
         StringSegmentEndChar = CHAR_NULL;
         for ( StringSegmentEnd = StringSegment
-            ; StringSegmentEnd != CHAR_NULL
+            ; *StringSegmentEnd != CHAR_NULL
             ; StringSegmentEnd++
             , Column++
@@ -411 +432 @@
   if (!EFI_ERROR (Status)) {
     ConsoleLoggerResetBuffers(ConsoleInfo);
+    if (ExtendedVerification) {
+      ConsoleInfo->OriginalStartRow = 0;
+      ConsoleInfo->CurrentStartRow = 0;
+    }
   }
 
@@ -425 +450 @@
 **/
 EFI_STATUS
-EFIAPI
 AppendStringToHistory(
   IN CONST CHAR16 *String,
@@ -580 +604 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerOutputStringSplit(
   IN CONST CHAR16   *String,
@@ -609 +632 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerDoPageBreak(
   VOID
@@ -668 +690 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerPrintWithPageBreak(
   IN CONST CHAR16   *String,
@@ -964 +985 @@
   //
   if (!EFI_ERROR (Status)) {
-    ConsoleInfo->OurConOut.Mode = gST->ConOut->Mode;
+    ConsoleInfo->OurConOut.Mode = ConsoleInfo->OldConOut->Mode;
     ConsoleLoggerResetBuffers(ConsoleInfo);
+    ConsoleInfo->OriginalStartRow = 0;
+    ConsoleInfo->CurrentStartRow = 0;
+    ConsoleInfo->OurConOut.ClearScreen (&ConsoleInfo->OurConOut);
   }
 
@@ -1176 +1200 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerResetBuffers(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ConsoleLogger.h

@@ -59 +59 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerInstall(
   IN CONST UINTN ScreensToSave,
@@ -75 +74 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerUninstall(
   IN OUT CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -93 +91 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerDisplayHistory(
   IN CONST BOOLEAN  Forward,
@@ -110 +107 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerStopHistory(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -123 +119 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateDisplayFromHistory(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -321 +316 @@
 **/
 EFI_STATUS
-EFIAPI
 ConsoleLoggerResetBuffers(
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo

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

@@ -2 +2 @@
   Function definitions for shell simple text in and out on top of file handles.
 
-  Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -15 +15 @@
 
 #include "Shell.h"
+
+extern BOOLEAN AsciiRedirection;
 
 typedef struct {
@@ -82 +84 @@
 {
   UINTN Size;
+  UINTN CharSize;
 
   //
@@ -99 +102 @@
   Size = sizeof(CHAR16);
 
+  if(!AsciiRedirection) {
+    CharSize = sizeof(CHAR16);
+  } else {
+    CharSize = sizeof(CHAR8);
+  }
   //
   // Decrement the amount of free space by Size or set to zero (for odd length files)
   //
-  if (((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL *)This)->RemainingBytesOfInputFile > Size) {
-    ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL *)This)->RemainingBytesOfInputFile -= Size;
+  if (((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL *)This)->RemainingBytesOfInputFile > CharSize) {
+    ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL *)This)->RemainingBytesOfInputFile -= CharSize;
   } else {
     ((SHELL_EFI_SIMPLE_TEXT_INPUT_PROTOCOL *)This)->RemainingBytesOfInputFile = 0;
@@ -126 +134 @@
 **/
 EFI_SIMPLE_TEXT_INPUT_PROTOCOL*
-EFIAPI
 CreateSimpleTextInOnFile(
   IN SHELL_FILE_HANDLE  FileHandleToUse,
@@ -193 +200 @@
 **/
 EFI_STATUS
-EFIAPI
 CloseSimpleTextInOnFile(
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *SimpleTextIn
@@ -427 +433 @@
 **/
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*
-EFIAPI
 CreateSimpleTextOutOnFile(
   IN SHELL_FILE_HANDLE               FileHandleToUse,
@@ -477 +482 @@
     return ((EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)ProtocolToReturn);
   } else {
-    FreePool(ProtocolToReturn);
+    SHELL_FREE_NON_NULL(ProtocolToReturn->SimpleTextOut.Mode);
+    SHELL_FREE_NON_NULL(ProtocolToReturn);
     return (NULL);
   }
@@ -491 +497 @@
 **/
 EFI_STATUS
-EFIAPI
 CloseSimpleTextOutOnFile(
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *SimpleTextOut
@@ -504 +509 @@
     &gEfiSimpleTextOutProtocolGuid,
     &(((SHELL_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*)SimpleTextOut)->SimpleTextOut));
+  FreePool(SimpleTextOut->Mode);
   FreePool(SimpleTextOut);
   return (Status);

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

@@ -2 +2 @@
   Function definitions for shell simple text in and out on top of file handles.
 
-  Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
@@ -28 +28 @@
 **/
 EFI_SIMPLE_TEXT_INPUT_PROTOCOL*
-EFIAPI
 CreateSimpleTextInOnFile(
   IN SHELL_FILE_HANDLE  FileHandleToUse,
@@ -43 +42 @@
 **/
 EFI_STATUS
-EFIAPI
 CloseSimpleTextInOnFile(
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *SimpleTextIn
@@ -60 +58 @@
 **/
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*
-EFIAPI
 CreateSimpleTextOutOnFile(
   IN SHELL_FILE_HANDLE               FileHandleToUse,
@@ -76 +73 @@
 **/
 EFI_STATUS
-EFIAPI
 CloseSimpleTextOutOnFile(
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *SimpleTextOut

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/FileHandleInternal.h

@@ -24 +24 @@
 **/
 VOID
-EFIAPI
 MoveCursorBackward (
   IN     UINTN                   LineLength,
@@ -40 +39 @@
 **/
 VOID
-EFIAPI
 MoveCursorForward (
   IN     UINTN                   LineLength,
@@ -58 +56 @@
 **/
 VOID
-EFIAPI
 PrintCommandHistory (
   IN CONST UINTN TotalCols,

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

@@ -3 +3 @@
   StdIn, StdOut, StdErr, etc...).
 
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-  Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
+  Copyright 2016 Dell Inc.
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -17 +18 @@
 #include "Shell.h"
 #include "FileHandleInternal.h"
+
+#define MEM_WRITE_REALLOC_OVERHEAD 1024
 
 /**
@@ -160 +163 @@
   if (ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoConsoleOut) {
     return (EFI_UNSUPPORTED);
-  } else {
-    return (gST->ConOut->OutputString(gST->ConOut, Buffer));
-  }
+  }
+  if (*((CHAR16 *)Buffer) == gUnicodeFileTag) {
+    return (gST->ConOut->OutputString(gST->ConOut, (CHAR16 *)Buffer + 1));
+  }
+  return (gST->ConOut->OutputString(gST->ConOut, Buffer));
 }
 
@@ -286 +291 @@
 {
   return (EFI_SUCCESS);
+}
+
+/**
+  Create the TAB completion list.
+
+  @param[in]  InputString       The command line to expand.
+  @param[in]  StringLen         Length of the command line.
+  @param[in]  BufferSize        Buffer size.
+  @param[in, out] TabCompletionList Return the TAB completion list.
+  @param[in, out] TabUpdatePos      Return the TAB update position.
+**/
+EFI_STATUS
+CreateTabCompletionList (
+  IN CONST CHAR16             *InputString,
+  IN CONST UINTN              StringLen,
+  IN CONST UINTN              BufferSize,
+  IN OUT EFI_SHELL_FILE_INFO  **TabCompletionList,
+  IN OUT   UINTN              *TabUpdatePos
+)
+{
+  BOOLEAN             InQuotation;
+  UINTN               TabPos;
+  UINTN               Index;
+  CONST CHAR16        *Cwd;
+  EFI_STATUS          Status;
+  CHAR16              *TabStr;
+  EFI_SHELL_FILE_INFO *FileList;
+  EFI_SHELL_FILE_INFO *FileInfo;
+  EFI_SHELL_FILE_INFO *TempFileInfo;
+
+  //
+  // Allocate buffers
+  //
+  TabStr = AllocateZeroPool (BufferSize);
+  if (TabStr == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  //
+  // handle auto complete of file and directory names...
+  // E.g.: cd fs0:\EFI\Bo<TAB>
+  //          ^        ^
+  //          TabPos   TabUpdatePos
+  //
+  TabPos        = 0;
+  *TabUpdatePos = 0;
+  FileList      = NULL;
+  InQuotation   = FALSE;
+  for (Index = 0; Index < StringLen; Index++) {
+    switch (InputString[Index]) {
+    case L'\"':
+      InQuotation = (BOOLEAN) (!InQuotation);
+      break;
+
+    case L' ':
+      if (!InQuotation) {
+        TabPos = Index + 1;
+        *TabUpdatePos = TabPos;
+      }
+      break;
+
+    case L':':
+      //
+      // handle the case "fs0:<TAB>"
+      // Update the TabUpdatePos as well.
+      //
+    case L'\\':
+      *TabUpdatePos = Index + 1;
+      break;
+
+    default:
+      break;
+    }
+  }
+
+  if (StrStr (InputString + TabPos, L":") == NULL) {
+    //
+    // If file path doesn't contain ":", ...
+    //
+    Cwd = ShellInfoObject.NewEfiShellProtocol->GetCurDir (NULL);
+    if (Cwd != NULL) {
+      if (InputString[TabPos] != L'\\') {
+        //
+        // and it doesn't begin with "\\", it's a path relative to current directory.
+        // TabStr = "<cwd>\\"
+        //
+        StrnCpyS (TabStr, BufferSize / sizeof (CHAR16), Cwd, (BufferSize) / sizeof (CHAR16) - 1);
+        StrCatS (TabStr, (BufferSize) / sizeof (CHAR16), L"\\");
+      } else {
+        //
+        // and it begins with "\\", it's a path pointing to root directory of current map.
+        // TabStr = "fsx:"
+        //
+        Index = StrStr (Cwd, L":") - Cwd + 1;
+        StrnCpyS (TabStr, BufferSize / sizeof (CHAR16), Cwd, Index);
+      }
+    }
+  }
+  StrnCatS (TabStr, (BufferSize) / sizeof (CHAR16), InputString + TabPos, StringLen - TabPos);
+  StrnCatS (TabStr, (BufferSize) / sizeof (CHAR16), L"*", (BufferSize) / sizeof (CHAR16) - 1 - StrLen (TabStr));
+  Status  = ShellInfoObject.NewEfiShellProtocol->FindFiles(TabStr, &FileList);
+
+  //
+  // Filter out the non-directory for "CD" command
+  // Filter "." and ".." for all
+  //
+  if (!EFI_ERROR (Status) && FileList != NULL) {
+    //
+    // Skip the spaces in the beginning
+    //
+    while (*InputString == L' ') {
+      InputString++;
+    }
+
+    for (FileInfo = (EFI_SHELL_FILE_INFO *) GetFirstNode (&FileList->Link); !IsNull (&FileList->Link, &FileInfo->Link); ) {
+      if (((StrCmp (FileInfo->FileName, L".") == 0) || (StrCmp (FileInfo->FileName, L"..") == 0)) ||
+          (((InputString[0] == L'c' || InputString[0] == L'C') && (InputString[1] == L'd' || InputString[1] == L'D')) &&
+           (ShellIsDirectory (FileInfo->FullName) != EFI_SUCCESS))) {
+        TempFileInfo = FileInfo;
+        FileInfo = (EFI_SHELL_FILE_INFO *) RemoveEntryList (&FileInfo->Link);
+        InternalFreeShellFileInfoNode (TempFileInfo);
+      } else {
+        FileInfo = (EFI_SHELL_FILE_INFO *) GetNextNode (&FileList->Link, &FileInfo->Link);
+      }
+    }
+  }
+
+  if (FileList != NULL && !IsListEmpty (&FileList->Link)) {
+    Status = EFI_SUCCESS;
+  } else {
+    ShellInfoObject.NewEfiShellProtocol->FreeFileList (&FileList);
+    Status = EFI_NOT_FOUND;
+  }
+
+  FreePool (TabStr);
+
+  *TabCompletionList = FileList;
+  return Status;
 }
 
@@ -322 +465 @@
   CHAR16              *CurrentString;
   BOOLEAN             Done;
+  UINTN               TabUpdatePos;   // Start index of the string updated by TAB stroke
   UINTN               Column;         // Column of current cursor
   UINTN               Row;            // Row of current cursor
@@ -330 +474 @@
   UINTN               StringCurPos;   // Line index corresponding to the cursor
   UINTN               MaxStr;         // Maximum possible line length
-  UINTN               Index;
   UINTN               TotalColumn;     // Num of columns in the console
   UINTN               TotalRow;       // Num of rows in the console
@@ -344 +487 @@
   EFI_STATUS          Status;
   BOOLEAN             InTabScrolling; // Whether in TAB-completion state
-  EFI_SHELL_FILE_INFO *FoundFileList;
-  EFI_SHELL_FILE_INFO *TabLinePos;
-  EFI_SHELL_FILE_INFO *TempPos;
-  CHAR16              *TabStr;
+  EFI_SHELL_FILE_INFO *TabCompleteList;
+  EFI_SHELL_FILE_INFO *TabCurrent;
+  UINTN               EventIndex;
   CHAR16              *TabOutputStr;
-  BOOLEAN             InQuotationMode;
-  CHAR16              *TempStr;
-  UINTN               TabPos;         // Start index of the string to search for TAB completion.
-  UINTN               TabUpdatePos;   // Start index of the string updated by TAB stroke
-//  UINTN               Count;
-  UINTN               EventIndex;
-  CONST CHAR16        *Cwd;
 
   //
@@ -376 +511 @@
   InTabScrolling    = FALSE;
   Status            = EFI_SUCCESS;
-  TabLinePos        = NULL;
-  FoundFileList     = NULL;
-  TempPos           = NULL;
-  TabPos            = 0;
+  TabOutputStr      = NULL;
   TabUpdatePos      = 0;
-
-  //
-  // Allocate buffers
-  //
-  TabStr            = AllocateZeroPool (*BufferSize);
-  if (TabStr == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-  TabOutputStr      = AllocateZeroPool (*BufferSize);
-  if (TabOutputStr == NULL) {
-    FreePool(TabStr);
-    return EFI_OUT_OF_RESOURCES;
-  }
+  TabCompleteList   = NULL;
+  TabCurrent        = NULL;
 
   //
@@ -418 +539 @@
     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
     if (EFI_ERROR (Status)) {
+
+      if (Status == EFI_NOT_READY)
+        continue;
+
+      ZeroMem (CurrentString, MaxStr * sizeof(CHAR16));
+      StringLen = 0;
       break;
     }
@@ -444 +571 @@
     //
     if (InTabScrolling && Key.UnicodeChar != CHAR_TAB) {
-        if (FoundFileList != NULL) {
-          ShellInfoObject.NewEfiShellProtocol->FreeFileList (&FoundFileList);
-          DEBUG_CODE(FoundFileList = NULL;);
-        }
-        InTabScrolling = FALSE;
+      if (TabCompleteList != NULL) {
+        ShellInfoObject.NewEfiShellProtocol->FreeFileList (&TabCompleteList);
+        DEBUG_CODE(TabCompleteList = NULL;);
+      }
+      InTabScrolling = FALSE;
     }
 
@@ -481 +608 @@
 
     case CHAR_TAB:
-      //
-      // handle auto complete of file and directory names...
-      //
+      if (!InTabScrolling) {
+        TabCurrent = NULL;
+        //
+        // Initialize a tab complete operation.
+        //
+        Status = CreateTabCompletionList (CurrentString, StringLen, *BufferSize, &TabCompleteList, &TabUpdatePos);
+        if (!EFI_ERROR(Status)) {
+          InTabScrolling = TRUE;
+        }
+
+        //
+        // We do not set up the replacement.
+        // The next section will do that.
+        //
+      }
+
       if (InTabScrolling) {
-        ASSERT(FoundFileList != NULL);
-        ASSERT(TabLinePos != NULL);
-        TabLinePos = (EFI_SHELL_FILE_INFO*)GetNextNode(&(FoundFileList->Link), &TabLinePos->Link);
-        if (IsNull(&(FoundFileList->Link), &TabLinePos->Link)) {
-          TabLinePos = (EFI_SHELL_FILE_INFO*)GetNextNode(&(FoundFileList->Link), &TabLinePos->Link);
+        //
+        // We are in a tab complete operation.
+        // set up the next replacement.
+        //
+        ASSERT(TabCompleteList != NULL);
+        if (TabCurrent == NULL) {
+          TabCurrent = (EFI_SHELL_FILE_INFO*) GetFirstNode (&TabCompleteList->Link);
+        } else {
+          TabCurrent = (EFI_SHELL_FILE_INFO*) GetNextNode (&TabCompleteList->Link, &TabCurrent->Link);
         }
-      } else {
-        TabPos          = 0;
-        TabUpdatePos    = 0;
-        InQuotationMode = FALSE;
-        for (Index = 0; Index < StringLen; Index++) {
-          if (CurrentString[Index] == L'\"') {
-            InQuotationMode = (BOOLEAN)(!InQuotationMode);
-          }
-          if (CurrentString[Index] == L' ' && !InQuotationMode) {
-            TabPos = Index + 1;
-            TabUpdatePos = Index + 1;
-          }
-          if (CurrentString[Index] == L'\\') {
-            TabUpdatePos = Index + 1;
-          }
-        }
-        if (StrStr(CurrentString + TabPos, L":") == NULL) {
-          Cwd = ShellInfoObject.NewEfiShellProtocol->GetCurDir(NULL);
-          if (Cwd != NULL) {
-            StrnCpy(TabStr, Cwd, (*BufferSize)/sizeof(CHAR16) - 1);
-            if (TabStr[StrLen(TabStr)-1] == L'\\' && *(CurrentString + TabPos) == L'\\' ) {
-              TabStr[StrLen(TabStr)-1] = CHAR_NULL;
-            }
-            StrnCat(TabStr, CurrentString + TabPos, (StringLen - TabPos) * sizeof (CHAR16));
-          } else {
-            *TabStr = CHAR_NULL;
-            StrnCat(TabStr, CurrentString + TabPos, (StringLen - TabPos) * sizeof (CHAR16));
-          }
-        } else {
-          StrnCpy(TabStr, CurrentString + TabPos, (*BufferSize)/sizeof(CHAR16) - 1);
-        }
-        StrnCat(TabStr, L"*", (*BufferSize)/sizeof(CHAR16) - 1 - StrLen(TabStr));
-        FoundFileList = NULL;
-        Status  = ShellInfoObject.NewEfiShellProtocol->FindFiles(TabStr, &FoundFileList);
-        for ( TempStr = CurrentString
-            ; *TempStr == L' '
-            ; TempStr++); // note the ';'... empty for loop
-        //
-        // make sure we have a list before we do anything more...
-        //
-        if (EFI_ERROR (Status) || FoundFileList == NULL) {
-          InTabScrolling = FALSE;
-          TabLinePos = NULL;
-          continue;
-        } else {
-          //
-          // enumerate through the list of files
-          //
-          for ( TempPos = (EFI_SHELL_FILE_INFO*)GetFirstNode(&(FoundFileList->Link))
-              ; !IsNull(&FoundFileList->Link, &TempPos->Link)
-              ; TempPos = (EFI_SHELL_FILE_INFO*)GetNextNode(&(FoundFileList->Link), &(TempPos->Link))
-             ){
-            //
-            // If "cd" is typed, only directory name will be auto-complete filled
-            // in either case . and .. will be removed.
-            //
-            if ((((TempStr[0] == L'c' || TempStr[0] == L'C') &&
-                (TempStr[1] == L'd' || TempStr[1] == L'D')
-               ) && ((ShellIsDirectory(TempPos->FullName) != EFI_SUCCESS)
-                ||(StrCmp(TempPos->FileName, L".") == 0)
-                ||(StrCmp(TempPos->FileName, L"..") == 0)
-               )) || ((StrCmp(TempPos->FileName, L".") == 0)
-                ||(StrCmp(TempPos->FileName, L"..") == 0))){
-                TabLinePos = TempPos;
-                TempPos = (EFI_SHELL_FILE_INFO*)(RemoveEntryList(&(TempPos->Link))->BackLink);
-                InternalFreeShellFileInfoNode(TabLinePos);
-            }
-          }
-          if (FoundFileList != NULL && !IsListEmpty(&FoundFileList->Link)) {
-            TabLinePos = (EFI_SHELL_FILE_INFO*)GetFirstNode(&FoundFileList->Link);
-            InTabScrolling = TRUE;
-          } else {
-            FreePool(FoundFileList);
-            FoundFileList = NULL;
-          }
+
+        //
+        // Skip over the empty list beginning node
+        //
+        if (IsNull(&TabCompleteList->Link, &TabCurrent->Link)) {
+          TabCurrent = (EFI_SHELL_FILE_INFO*) GetNextNode (&TabCompleteList->Link, &TabCurrent->Link);
         }
       }
@@ -706 +781 @@
     //
     if (InTabScrolling) {
+      TabOutputStr = AllocateZeroPool (*BufferSize);
+      if (TabOutputStr == NULL) {
+        Status = EFI_OUT_OF_RESOURCES;
+      }
+    }
+
+    if (InTabScrolling && TabOutputStr != NULL) {
+
       //
       // Adjust the column and row to the start of TAB-completion string.
@@ -711 +794 @@
       Column = (StartColumn + TabUpdatePos) % TotalColumn;
       Row -= (StartColumn + StringCurPos) / TotalColumn - (StartColumn + TabUpdatePos) / TotalColumn;
-      OutputLength = StrLen (TabLinePos->FileName);
+      OutputLength = StrLen (TabCurrent->FileName);
       //
       // if the output string contains  blank space, quotation marks L'\"'
       // should be added to the output.
       //
-      if (StrStr(TabLinePos->FileName, L" ") != NULL){
+      if (StrStr(TabCurrent->FileName, L" ") != NULL){
         TabOutputStr[0] = L'\"';
-        CopyMem (TabOutputStr + 1, TabLinePos->FileName, OutputLength * sizeof (CHAR16));
+        CopyMem (TabOutputStr + 1, TabCurrent->FileName, OutputLength * sizeof (CHAR16));
         TabOutputStr[OutputLength + 1] = L'\"';
         TabOutputStr[OutputLength + 2] = CHAR_NULL;
       } else {
-        CopyMem (TabOutputStr, TabLinePos->FileName, OutputLength * sizeof (CHAR16));
+        CopyMem (TabOutputStr, TabCurrent->FileName, OutputLength * sizeof (CHAR16));
         TabOutputStr[OutputLength] = CHAR_NULL;
       }
@@ -733 +816 @@
         Delete = StringLen - TabUpdatePos - OutputLength;
       }
+
+      FreePool(TabOutputStr);
     }
 
@@ -836 +921 @@
   }
 
-  FreePool (TabStr);
-  FreePool (TabOutputStr);
   //
   // Return the data to the caller
@@ -847 +930 @@
   // prevent memory leaks...
   //
-  ASSERT(FoundFileList == NULL);
+  if (TabCompleteList != NULL) {
+    ShellInfoObject.NewEfiShellProtocol->FreeFileList (&TabCompleteList);
+  }
+  ASSERT(TabCompleteList == NULL);
 
   return Status;
@@ -954 +1040 @@
   UINTN       NewSize;
   EFI_STATUS  Status;
+  BOOLEAN     Volatile;
+  UINTN       TotalSize;
 
   //
@@ -963 +1051 @@
   NewBuffer   = NULL;
   NewSize     = 0;
+  TotalSize   = 0;
+
+  Status = IsVolatileEnv (((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &Volatile);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
 
   Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
   if (Status == EFI_BUFFER_TOO_SMALL) {
-    NewBuffer = AllocateZeroPool(NewSize + sizeof(CHAR16));
+    TotalSize = NewSize + sizeof (CHAR16);
+    NewBuffer = AllocateZeroPool (TotalSize);
     if (NewBuffer == NULL) {
       return EFI_OUT_OF_RESOURCES;
@@ -975 +1070 @@
   if (!EFI_ERROR(Status) && NewBuffer != NULL) {
 
-    if (StrSize(NewBuffer) > 6)
-    {
-      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;
+    if (TotalSize / sizeof (CHAR16) >= 3) {
+      if ( (((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 2] == CHAR_LINEFEED) &&
+           (((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] == CHAR_CARRIAGE_RETURN)
+         ) {
+        ((CHAR16*)NewBuffer)[TotalSize / sizeof (CHAR16) - 3] = CHAR_NULL;
+        //
+        // If the NewBuffer end with \r\n\0, We will repace '\r' by '\0' and then update TotalSize.
+        //
+        TotalSize -= sizeof(CHAR16) * 2;
       }
 
-      if (IsVolatileEnv(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name)) {
-        Status = SHELL_SET_ENVIRONMENT_VARIABLE_V(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, StrSize(NewBuffer), NewBuffer);
+      if (Volatile) {
+        Status = SHELL_SET_ENVIRONMENT_VARIABLE_V (
+                   ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+                   TotalSize - sizeof (CHAR16),
+                   NewBuffer
+                   );
+
+        if (!EFI_ERROR(Status)) {
+          Status = ShellAddEnvVarToList (
+                     ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+                     NewBuffer,
+                     TotalSize,
+                     EFI_VARIABLE_BOOTSERVICE_ACCESS
+                     );
+        }
       } else {
-        Status = SHELL_SET_ENVIRONMENT_VARIABLE_NV(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, StrSize(NewBuffer), NewBuffer);
+        Status = SHELL_SET_ENVIRONMENT_VARIABLE_NV (
+                   ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+                   TotalSize - sizeof (CHAR16),
+                   NewBuffer
+                   );
+
+        if (!EFI_ERROR(Status)) {
+          Status = ShellAddEnvVarToList (
+                     ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+                     NewBuffer,
+                     TotalSize,
+                     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS
+                     );
+        }
       }
     }
@@ -1037 +1162 @@
 /**
   File style interface for Volatile Environment Variable (Write).
+  This function also caches the environment variable into gShellEnvVarList.
 
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
@@ -1042 +1168 @@
   @param[in] Buffer            The pointer to the buffer to write.
 
-  @retval EFI_SUCCESS   The data was read.
+  @retval EFI_SUCCESS             The data was successfully write to variable.
+  @retval SHELL_OUT_OF_RESOURCES  A memory allocation failed.
 **/
 EFI_STATUS
@@ -1055 +1182 @@
   UINTN       NewSize;
   EFI_STATUS  Status;
+  UINTN       TotalSize;
 
   NewBuffer   = NULL;
   NewSize     = 0;
+  TotalSize   = 0;
 
   Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
-  if (Status == EFI_BUFFER_TOO_SMALL){
-    NewBuffer = AllocateZeroPool(NewSize + *BufferSize + sizeof(CHAR16));
+  if (Status == EFI_BUFFER_TOO_SMALL) {
+    TotalSize = NewSize + *BufferSize + sizeof (CHAR16);
+  } else if (Status == EFI_NOT_FOUND) {
+    TotalSize = *BufferSize + sizeof(CHAR16);
+  } else {
+    return Status;
+  }
+
+  NewBuffer = AllocateZeroPool (TotalSize);
+  if (NewBuffer == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  if (Status == EFI_BUFFER_TOO_SMALL) {
     Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
   }
-  if (!EFI_ERROR(Status) && NewBuffer != NULL) {
-    while (((CHAR16*)NewBuffer)[NewSize/2] == CHAR_NULL) {
-      //
-      // We want to overwrite the CHAR_NULL
-      //
-      NewSize -= 2;
-    }
-    CopyMem((UINT8*)NewBuffer + NewSize + 2, Buffer, *BufferSize);
-    Status = SHELL_SET_ENVIRONMENT_VARIABLE_V(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, StrSize(NewBuffer), NewBuffer);
-    FreePool(NewBuffer);
-    return (Status);
-  } else {
-    SHELL_FREE_NON_NULL(NewBuffer);
-    return (SHELL_SET_ENVIRONMENT_VARIABLE_V(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, *BufferSize, Buffer));
-  }
+
+  if (EFI_ERROR (Status) && Status != EFI_NOT_FOUND) {
+    FreePool (NewBuffer);
+    return Status;
+  }
+
+  CopyMem ((UINT8*)NewBuffer + NewSize, Buffer, *BufferSize);
+  Status = ShellAddEnvVarToList (
+             ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+             NewBuffer,
+             TotalSize,
+             EFI_VARIABLE_BOOTSERVICE_ACCESS
+             );
+  if (EFI_ERROR(Status)) {
+    FreePool (NewBuffer);
+    return Status;
+  }
+
+  Status = SHELL_SET_ENVIRONMENT_VARIABLE_V (
+             ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+             TotalSize - sizeof (CHAR16),
+             NewBuffer
+             );
+  if (EFI_ERROR(Status)) {
+    ShellRemvoeEnvVarFromList (((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name);
+  }
+
+  FreePool (NewBuffer);
+  return Status;
 }
 
@@ -1084 +1239 @@
 /**
   File style interface for Non Volatile Environment Variable (Write).
+  This function also caches the environment variable into gShellEnvVarList.
 
   @param[in] This              The pointer to the EFI_FILE_PROTOCOL object.
@@ -1089 +1245 @@
   @param[in] Buffer            The pointer to the buffer to write.
 
-  @retval EFI_SUCCESS   The data was read.
+  @retval EFI_SUCCESS             The data was successfully write to variable.
+  @retval SHELL_OUT_OF_RESOURCES  A memory allocation failed.
 **/
 EFI_STATUS
@@ -1102 +1259 @@
   UINTN       NewSize;
   EFI_STATUS  Status;
+  UINTN       TotalSize;
 
   NewBuffer   = NULL;
   NewSize     = 0;
+  TotalSize   = 0;
 
   Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
-  if (Status == EFI_BUFFER_TOO_SMALL){
-    NewBuffer = AllocateZeroPool(NewSize + *BufferSize);
+  if (Status == EFI_BUFFER_TOO_SMALL) {
+    TotalSize = NewSize + *BufferSize + sizeof (CHAR16);
+  } else if (Status == EFI_NOT_FOUND) {
+    TotalSize = *BufferSize + sizeof (CHAR16);
+  } else {
+    return Status;
+  }
+
+  NewBuffer = AllocateZeroPool (TotalSize);
+  if (NewBuffer == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  if (Status == EFI_BUFFER_TOO_SMALL) {
     Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
   }
-  if (!EFI_ERROR(Status)) {
-    CopyMem((UINT8*)NewBuffer + NewSize, Buffer, *BufferSize);
-    return (SHELL_SET_ENVIRONMENT_VARIABLE_NV(
-    ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
-    NewSize + *BufferSize,
-    NewBuffer));
-  } else {
-    return (SHELL_SET_ENVIRONMENT_VARIABLE_NV(
-    ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
-    *BufferSize,
-    Buffer));
-  }
+
+  if (EFI_ERROR(Status) && Status != EFI_NOT_FOUND) {
+    FreePool (NewBuffer);
+    return Status;
+  }
+
+  CopyMem ((UINT8*) NewBuffer + NewSize, Buffer, *BufferSize);
+  Status = ShellAddEnvVarToList (
+             ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+             NewBuffer,
+             TotalSize,
+             EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS
+             );
+  if (EFI_ERROR (Status)) {
+    FreePool (NewBuffer);
+    return Status;
+  }
+
+  Status = SHELL_SET_ENVIRONMENT_VARIABLE_NV (
+             ((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name,
+             TotalSize - sizeof (CHAR16),
+             NewBuffer
+             );
+  if (EFI_ERROR (Status)) {
+    ShellRemvoeEnvVarFromList (((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name);
+  }
+
+  FreePool (NewBuffer);
+  return Status;
 }
 
@@ -1135 +1323 @@
 **/
 EFI_FILE_PROTOCOL*
-EFIAPI
 CreateFileInterfaceEnv(
   IN CONST CHAR16 *EnvName
   )
 {
+  EFI_STATUS                     Status;
   EFI_FILE_PROTOCOL_ENVIRONMENT  *EnvFileInterface;
   UINTN                          EnvNameSize;
+  BOOLEAN                        Volatile;
 
   if (EnvName == NULL) {
     return (NULL);
+  }
+
+  Status = IsVolatileEnv (EnvName, &Volatile);
+  if (EFI_ERROR (Status)) {
+    return NULL;
   }
 
@@ -1175 +1369 @@
   // Assign the different members for Volatile and Non-Volatile variables
   //
-  if (IsVolatileEnv(EnvName)) {
+  if (Volatile) {
     EnvFileInterface->Write       = FileInterfaceEnvVolWrite;
   } else {
@@ -1191 +1385 @@
 **/
 VOID
-EFIAPI
 MoveCursorBackward (
   IN     UINTN                   LineLength,
@@ -1221 +1414 @@
 **/
 VOID
-EFIAPI
 MoveCursorForward (
   IN     UINTN                   LineLength,
@@ -1253 +1445 @@
 **/
 VOID
-EFIAPI
 PrintCommandHistory (
   IN CONST UINTN TotalCols,
@@ -1318 +1509 @@
   UINT64                BufferSize;
   BOOLEAN               Unicode;
+  UINT64                FileSize;
 } EFI_FILE_PROTOCOL_MEM;
 
@@ -1336 +1528 @@
   )
 {
-  if (Position <= ((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize) {
+  if (Position <= ((EFI_FILE_PROTOCOL_MEM*)This)->FileSize) {
     ((EFI_FILE_PROTOCOL_MEM*)This)->Position = Position;
     return (EFI_SUCCESS);
@@ -1364 +1556 @@
 
 /**
+  File style interface for Mem (GetInfo).
+
+  @param  This            Protocol instance pointer.
+  @param  InformationType Type of information to return in Buffer.
+  @param  BufferSize      On input size of buffer, on output amount of data in buffer.
+  @param  Buffer          The buffer to return data.
+
+  @retval EFI_SUCCESS          Data was returned.
+  @retval EFI_UNSUPPORT        InformationType is not supported.
+  @retval EFI_NO_MEDIA         The device has no media.
+  @retval EFI_DEVICE_ERROR     The device reported an error.
+  @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.
+  @retval EFI_WRITE_PROTECTED  The device is write protected.
+  @retval EFI_ACCESS_DENIED    The file was open for read only.
+  @retval EFI_BUFFER_TOO_SMALL Buffer was too small; required size returned in BufferSize.
+
+**/
+EFI_STATUS
+EFIAPI
+FileInterfaceMemGetInfo(
+  IN EFI_FILE_PROTOCOL        *This,
+  IN EFI_GUID                 *InformationType,
+  IN OUT UINTN                *BufferSize,
+  OUT VOID                    *Buffer
+  )
+{
+  EFI_FILE_INFO               *FileInfo;
+
+  if (CompareGuid (InformationType, &gEfiFileInfoGuid)) {
+    if (*BufferSize < sizeof (EFI_FILE_INFO)) {
+      *BufferSize = sizeof (EFI_FILE_INFO);
+      return EFI_BUFFER_TOO_SMALL;
+    }
+    if (Buffer == NULL) {
+      return EFI_INVALID_PARAMETER;
+    }
+    FileInfo = (EFI_FILE_INFO *)Buffer;
+    FileInfo->Size = sizeof (*FileInfo);
+    ZeroMem (FileInfo, sizeof (*FileInfo));
+    FileInfo->FileSize = ((EFI_FILE_PROTOCOL_MEM*)This)->FileSize;
+    FileInfo->PhysicalSize = FileInfo->FileSize;
+    return EFI_SUCCESS;
+  }
+
+  return EFI_UNSUPPORTED;
+}
+
+/**
   File style interface for Mem (Write).
 
@@ -1381 +1621 @@
   )
 {
-  CHAR8 *AsciiBuffer;
-  if (((EFI_FILE_PROTOCOL_MEM*)This)->Unicode) {
+  CHAR8                  *AsciiBuffer;
+  EFI_FILE_PROTOCOL_MEM  *MemFile;
+
+  MemFile = (EFI_FILE_PROTOCOL_MEM *) This;
+  if (MemFile->Unicode) {
     //
     // Unicode
     //
-    if ((UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->Position + (*BufferSize)) > (UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize)) {
-      ((EFI_FILE_PROTOCOL_MEM*)This)->Buffer = ReallocatePool((UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize), (UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize) + (*BufferSize) + 10, ((EFI_FILE_PROTOCOL_MEM*)This)->Buffer);
-      ((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize += (*BufferSize) + 10;
-    }
-    CopyMem(((UINT8*)((EFI_FILE_PROTOCOL_MEM*)This)->Buffer) + ((EFI_FILE_PROTOCOL_MEM*)This)->Position, Buffer, *BufferSize);
-    ((EFI_FILE_PROTOCOL_MEM*)This)->Position += (*BufferSize);
+    if ((UINTN)(MemFile->Position + (*BufferSize)) > (UINTN)(MemFile->BufferSize)) {
+      MemFile->Buffer = ReallocatePool((UINTN)(MemFile->BufferSize), (UINTN)(MemFile->BufferSize) + (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD, MemFile->Buffer);
+      MemFile->BufferSize += (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD;
+    }
+    CopyMem(((UINT8*)MemFile->Buffer) + MemFile->Position, Buffer, *BufferSize);
+    MemFile->Position += (*BufferSize);
+    MemFile->FileSize = MemFile->Position;
     return (EFI_SUCCESS);
   } else {
@@ -1402 +1646 @@
     }
     AsciiSPrint(AsciiBuffer, *BufferSize, "%S", Buffer);
-    if ((UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->Position + AsciiStrSize(AsciiBuffer)) > (UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize)) {
-      ((EFI_FILE_PROTOCOL_MEM*)This)->Buffer = ReallocatePool((UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize), (UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize) + AsciiStrSize(AsciiBuffer) + 10, ((EFI_FILE_PROTOCOL_MEM*)This)->Buffer);
-      ((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize += AsciiStrSize(AsciiBuffer) + 10;
-    }
-    CopyMem(((UINT8*)((EFI_FILE_PROTOCOL_MEM*)This)->Buffer) + ((EFI_FILE_PROTOCOL_MEM*)This)->Position, AsciiBuffer, AsciiStrSize(AsciiBuffer));
-    ((EFI_FILE_PROTOCOL_MEM*)This)->Position += AsciiStrSize(AsciiBuffer);
+    if ((UINTN)(MemFile->Position + AsciiStrSize(AsciiBuffer)) > (UINTN)(MemFile->BufferSize)) {
+      MemFile->Buffer = ReallocatePool((UINTN)(MemFile->BufferSize), (UINTN)(MemFile->BufferSize) + AsciiStrSize(AsciiBuffer) + MEM_WRITE_REALLOC_OVERHEAD, MemFile->Buffer);
+      MemFile->BufferSize += AsciiStrSize(AsciiBuffer) + MEM_WRITE_REALLOC_OVERHEAD;
+    }
+    CopyMem(((UINT8*)MemFile->Buffer) + MemFile->Position, AsciiBuffer, AsciiStrSize(AsciiBuffer));
+    MemFile->Position += (*BufferSize / sizeof(CHAR16));
+    MemFile->FileSize = MemFile->Position;
     FreePool(AsciiBuffer);
     return (EFI_SUCCESS);
@@ -1430 +1675 @@
   )
 {
-  if (*BufferSize > (UINTN)((((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize) - (UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->Position))) {
-    (*BufferSize) = (UINTN)((((EFI_FILE_PROTOCOL_MEM*)This)->BufferSize) - (UINTN)(((EFI_FILE_PROTOCOL_MEM*)This)->Position));
-  }
-  CopyMem(Buffer, ((UINT8*)((EFI_FILE_PROTOCOL_MEM*)This)->Buffer) + ((EFI_FILE_PROTOCOL_MEM*)This)->Position, (*BufferSize));
-  ((EFI_FILE_PROTOCOL_MEM*)This)->Position = ((EFI_FILE_PROTOCOL_MEM*)This)->Position + (*BufferSize);
+  EFI_FILE_PROTOCOL_MEM  *MemFile;
+
+  MemFile = (EFI_FILE_PROTOCOL_MEM *) This;
+  if (*BufferSize > (UINTN)((MemFile->FileSize) - (UINTN)(MemFile->Position))) {
+    (*BufferSize) = (UINTN)((MemFile->FileSize) - (UINTN)(MemFile->Position));
+  }
+  CopyMem(Buffer, ((UINT8*)MemFile->Buffer) + MemFile->Position, (*BufferSize));
+  MemFile->Position = MemFile->Position + (*BufferSize);
   return (EFI_SUCCESS);
 }
@@ -1468 +1716 @@
 **/
 EFI_FILE_PROTOCOL*
-EFIAPI
 CreateFileInterfaceMem(
   IN CONST BOOLEAN Unicode
@@ -1491 +1738 @@
   FileInterface->GetPosition = FileInterfaceMemGetPosition;
   FileInterface->SetPosition = FileInterfaceMemSetPosition;
-  FileInterface->GetInfo     = FileInterfaceNopGetInfo;
+  FileInterface->GetInfo     = FileInterfaceMemGetInfo;
   FileInterface->SetInfo     = FileInterfaceNopSetInfo;
   FileInterface->Flush       = FileInterfaceNopGeneric;
@@ -1502 +1749 @@
   ASSERT(FileInterface->BufferSize  == 0);
   ASSERT(FileInterface->Position    == 0);
+
+  if (Unicode) {
+    FileInterface->Buffer = AllocateZeroPool(sizeof(gUnicodeFileTag));
+    if (FileInterface->Buffer == NULL) {
+      FreePool (FileInterface);
+      return NULL;
+    }
+    *((CHAR16 *) (FileInterface->Buffer)) = EFI_UNICODE_BYTE_ORDER_MARK;
+    FileInterface->BufferSize = 2;
+    FileInterface->Position = 2;
+  }
 
   return ((EFI_FILE_PROTOCOL *)FileInterface);
@@ -1667 +1925 @@
   )
 {
-  CHAR8       *AsciiBuffer;
+  CHAR8       *AsciiStrBuffer;
+  CHAR16      *UscStrBuffer;
   UINTN       Size;
+  UINTN       CharNum;
   EFI_STATUS  Status;
   if (((EFI_FILE_PROTOCOL_FILE*)This)->Unicode) {
@@ -1679 +1939 @@
     // Ascii
     //
-    AsciiBuffer = AllocateZeroPool((Size = *BufferSize));
-    Status = (((EFI_FILE_PROTOCOL_FILE*)This)->Orig->Read(((EFI_FILE_PROTOCOL_FILE*)This)->Orig, &Size, AsciiBuffer));
-    UnicodeSPrint(Buffer, *BufferSize, L"%a", AsciiBuffer);
-    FreePool(AsciiBuffer);
+    Size  = (*BufferSize) / sizeof(CHAR16);
+    AsciiStrBuffer = AllocateZeroPool(Size + sizeof(CHAR8));
+    if (AsciiStrBuffer == NULL) {
+      return EFI_OUT_OF_RESOURCES;
+    }
+    UscStrBuffer = AllocateZeroPool(*BufferSize + sizeof(CHAR16));
+    if (UscStrBuffer== NULL) {
+      SHELL_FREE_NON_NULL(AsciiStrBuffer);
+      return EFI_OUT_OF_RESOURCES;
+    }
+    Status = (((EFI_FILE_PROTOCOL_FILE*)This)->Orig->Read(((EFI_FILE_PROTOCOL_FILE*)This)->Orig, &Size, AsciiStrBuffer));
+    if (!EFI_ERROR(Status)) {
+      CharNum = UnicodeSPrint(UscStrBuffer, *BufferSize + sizeof(CHAR16), L"%a", AsciiStrBuffer);
+      if (CharNum == Size) {
+        CopyMem (Buffer, UscStrBuffer, *BufferSize);
+      } else {
+        Status = EFI_UNSUPPORTED;
+      }
+    }
+    SHELL_FREE_NON_NULL(AsciiStrBuffer);
+    SHELL_FREE_NON_NULL(UscStrBuffer);
     return (Status);
   }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/FileHandleWrappers.h

@@ -56 +56 @@
 **/
 EFI_FILE_PROTOCOL*
-EFIAPI
 CreateFileInterfaceEnv(
   CONST CHAR16 *EnvName
@@ -71 +70 @@
 **/
 EFI_FILE_PROTOCOL*
-EFIAPI
 CreateFileInterfaceMem(
   IN CONST BOOLEAN Unicode

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

@@ -2 +2 @@
   This is THE shell (application)
 
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
-  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -26 +26 @@
   {
     {{
+      0,
       0,
       0,
@@ -70 +71 @@
 STATIC CONST CHAR16 mExecutableExtensions[] = L".NSH;.EFI";
 STATIC CONST CHAR16 mStartupScript[]        = L"startup.nsh";
+CONST CHAR16 mNoNestingEnvVarName[]         = L"nonesting";
+CONST CHAR16 mNoNestingTrue[]               = L"True";
+CONST CHAR16 mNoNestingFalse[]              = L"False";
 
 /**
@@ -77 +81 @@
 **/
 EFI_STATUS
-EFIAPI
 TrimSpaces(
   IN CHAR16 **String
@@ -110 +113 @@
 **/
 CHAR16*
-EFIAPI
 FindNextInstance(
   IN CONST CHAR16   *SourceString,
@@ -124 +126 @@
 
   //
-  // If nothing found, or we dont care about escape characters
+  // If nothing found, or we don't care about escape characters
   //
   if (Temp == NULL || !CheckForEscapeCharacter) {
@@ -144 +146 @@
 
 /**
-  Check whether the string between a pair of % is a valid envifronment variable name.
+  Check whether the string between a pair of % is a valid environment variable name.
 
   @param[in] BeginPercent       pointer to the first percent.
@@ -199 +201 @@
 **/
 BOOLEAN
-EFIAPI
 ContainsSplit(
   IN CONST CHAR16 *CmdLine
@@ -246 +247 @@
 
   @retval EFI_SUCCESS           The feature is enabled.
-  @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.
+  @retval EFI_OUT_OF_RESOURCES  There is not enough memory available.
 **/
 EFI_STATUS
-EFIAPI
 InternalEfiShellStartCtrlSMonitor(
   VOID
@@ -339 +339 @@
   EFI_HANDLE                      ConInHandle;
   EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *OldConIn;
+  SPLIT_LIST                      *Split;
 
   if (PcdGet8(PcdShellSupportLevel) > 3) {
@@ -442 +443 @@
     ASSERT_EFI_ERROR(Status);
 
+    Status = ShellInitEnvVarList ();
+
     //
     // Check the command line
@@ -456 +459 @@
       Status = ShellCommandCreateInitialMappingsAndPaths();
     }
+
+    //
+    // Set the environment variable for nesting support
+    //
+    Size = 0;
+    TempString = NULL;
+    if (!ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest) {
+      //
+      // No change.  require nesting in Shell Protocol Execute()
+      //
+      StrnCatGrow(&TempString,
+                  &Size,
+                  L"False",
+                  0);
+    } else {
+      StrnCatGrow(&TempString,
+                  &Size,
+                  mNoNestingTrue,
+                  0);
+    }
+    Status = InternalEfiShellSetEnv(mNoNestingEnvVarName, TempString, TRUE);
+    SHELL_FREE_NON_NULL(TempString);
+    Size = 0;
 
     //
@@ -596 +622 @@
 
           //
-          // Reset the CTRL-C event (yes we ignore the return values)
-          //
-          Status = gBS->CheckEvent (ShellInfoObject.NewEfiShellProtocol->ExecutionBreak);
-
-          //
           // Display Prompt
           //
@@ -638 +659 @@
       InternalEfiShellSetEnv(L"cwd", NULL, TRUE);
     }
-    CleanUpShellProtocol(ShellInfoObject.NewEfiShellProtocol);
+    CleanUpShellEnvironment (ShellInfoObject.NewEfiShellProtocol);
     DEBUG_CODE(ShellInfoObject.NewEfiShellProtocol = NULL;);
   }
@@ -647 +668 @@
 
   if (!IsListEmpty(&ShellInfoObject.SplitList.Link)){
-    ASSERT(FALSE); ///@todo finish this de-allocation.
+    ASSERT(FALSE); ///@todo finish this de-allocation (free SplitStdIn/Out when needed).
+
+    for ( Split = (SPLIT_LIST*)GetFirstNode (&ShellInfoObject.SplitList.Link)
+        ; !IsNull (&ShellInfoObject.SplitList.Link, &Split->Link)
+        ; Split = (SPLIT_LIST *)GetNextNode (&ShellInfoObject.SplitList.Link, &Split->Link)
+     ) {
+      RemoveEntryList (&Split->Link);
+      FreePool (Split);
+    }
+
+    DEBUG_CODE (InitializeListHead (&ShellInfoObject.SplitList.Link););
   }
 
@@ -676 +707 @@
   }
 
+  ShellFreeEnvVarList ();
+
   if (ShellCommandGetExit()) {
     return ((EFI_STATUS)ShellCommandGetExitCode());
@@ -685 +718 @@
   Sets all the alias' that were registered with the ShellCommandLib library.
 
-  @retval EFI_SUCCESS           all init commands were run sucessfully.
+  @retval EFI_SUCCESS           all init commands were run successfully.
 **/
 EFI_STATUS
-EFIAPI
 SetBuiltInAlias(
+  VOID
   )
 {
@@ -727 +760 @@
 **/
 BOOLEAN
-EFIAPI
 IsCommand(
   IN CONST CHAR16 *Command1,
@@ -748 +780 @@
 **/
 BOOLEAN
-EFIAPI
 IsScriptOnlyCommand(
   IN CONST CHAR16 *CommandName
@@ -770 +801 @@
   for the file that was loaded.
 
-  @param[in, out] DevPath       On a sucessful return the device path to the loaded image.
-  @param[in, out] FilePath      On a sucessful return the device path to the file.
-
-  @retval EFI_SUCCESS           The 2 device paths were sucessfully returned.
+  @param[in, out] DevPath       On a successful return the device path to the loaded image.
+  @param[in, out] FilePath      On a successful return the device path to the file.
+
+  @retval EFI_SUCCESS           The 2 device paths were successfully returned.
   @retval other                 A error from gBS->HandleProtocol.
 
@@ -779 +810 @@
 **/
 EFI_STATUS
-EFIAPI
 GetDevicePathsForImageAndFile (
   IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,
@@ -855 +885 @@
 **/
 EFI_STATUS
-EFIAPI
 ProcessCommandLine(
   VOID
@@ -874 +903 @@
 
   Status = gBS->LocateProtocol (
-                  &gEfiUnicodeCollationProtocolGuid,
+                  &gEfiUnicodeCollation2ProtocolGuid,
                   NULL,
                   (VOID **) &UnicodeCollation
                   );
   if (EFI_ERROR (Status)) {
-    return Status;
+    Status = gBS->LocateProtocol (
+                    &gEfiUnicodeCollationProtocolGuid,
+                    NULL,
+                    (VOID **) &UnicodeCollation
+                    );
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
   }
 
@@ -892 +928 @@
   ShellInfoObject.ShellInitSettings.BitUnion.Bits.Delay        = FALSE;
   ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit         = FALSE;
+  ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest       = FALSE;
   ShellInfoObject.ShellInitSettings.Delay = 5;
 
@@ -950 +987 @@
                                  ) == 0) {
       ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoVersion    = TRUE;
+    }
+    else if (UnicodeCollation->StriColl (
+                                 UnicodeCollation,
+                                 L"-nonest",
+                                 CurrentArg
+                                 ) == 0) {
+      ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest       = TRUE;
     }
     else if (UnicodeCollation->StriColl (
@@ -975 +1019 @@
     } else if (UnicodeCollation->StriColl (
                                    UnicodeCollation,
-                                   L"-_exit",
+                                   L"-exit",
                                    CurrentArg
                                    ) == 0) {
       ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit         = TRUE;
     } else if (StrnCmp (L"-", CurrentArg, 1) == 0) {
-      // Unrecognised option
+      // Unrecognized option
       ShellPrintHiiEx(-1, -1, NULL,
         STRING_TOKEN (STR_GEN_PROBLEM),
@@ -995 +1039 @@
       }
 
-      ShellInfoObject.ShellInitSettings.FileName = AllocateCopyPool(StrSize(CurrentArg), CurrentArg);
+      ShellInfoObject.ShellInitSettings.FileName = NULL;
+      Size = 0;
+      //
+      // If first argument contains a space, then add double quotes before the argument
+      //
+      if (StrStr (CurrentArg, L" ") != NULL) {
+        StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileName, &Size, L"\"", 0);
+        if (ShellInfoObject.ShellInitSettings.FileName == NULL) {
+          return (EFI_OUT_OF_RESOURCES);
+        }
+      }
+      StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileName, &Size, CurrentArg, 0);
       if (ShellInfoObject.ShellInitSettings.FileName == NULL) {
         return (EFI_OUT_OF_RESOURCES);
+      }
+      //
+      // If first argument contains a space, then add double quotes after the argument
+      //
+      if (StrStr (CurrentArg, L" ") != NULL) {
+        StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileName, &Size, L"\"", 0);
+        if (ShellInfoObject.ShellInitSettings.FileName == NULL) {
+          return (EFI_OUT_OF_RESOURCES);
+        }
       }
       //
@@ -1008 +1072 @@
       for (Size = 0 ; LoopVar < gEfiShellParametersProtocol->Argc ; LoopVar++) {
         ASSERT((ShellInfoObject.ShellInitSettings.FileOptions == NULL && Size == 0) || (ShellInfoObject.ShellInitSettings.FileOptions != NULL));
-        StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileOptions,
-                    &Size,
-                    L" ",
-                    0);
-        if (ShellInfoObject.ShellInitSettings.FileOptions == NULL) {
-          SHELL_FREE_NON_NULL(ShellInfoObject.ShellInitSettings.FileName);
-          return (EFI_OUT_OF_RESOURCES);
+        //
+        // Add a space between arguments
+        //
+        if (ShellInfoObject.ShellInitSettings.FileOptions != NULL) {
+          StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileOptions, &Size, L" ", 0);
+          if (ShellInfoObject.ShellInitSettings.FileOptions == NULL) {
+            SHELL_FREE_NON_NULL(ShellInfoObject.ShellInitSettings.FileName);
+            return (EFI_OUT_OF_RESOURCES);
+          }
+        }
+        //
+        // If an argumnent contains a space, then add double quotes before the argument
+        //
+        if (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L" ") != NULL) {
+          StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileOptions,
+                      &Size,
+                      L"\"",
+                      0);
+          if (ShellInfoObject.ShellInitSettings.FileOptions == NULL) {
+            SHELL_FREE_NON_NULL(ShellInfoObject.ShellInitSettings.FileName);
+            return (EFI_OUT_OF_RESOURCES);
+          }
         }
         StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileOptions,
@@ -1024 +1103 @@
           return (EFI_OUT_OF_RESOURCES);
         }
+        //
+        // If an argumnent contains a space, then add double quotes after the argument
+        //
+        if (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L" ") != NULL) {
+          StrnCatGrow(&ShellInfoObject.ShellInitSettings.FileOptions,
+                      &Size,
+                      L"\"",
+                      0);
+          if (ShellInfoObject.ShellInitSettings.FileOptions == NULL) {
+            SHELL_FREE_NON_NULL(ShellInfoObject.ShellInitSettings.FileName);
+            return (EFI_OUT_OF_RESOURCES);
+          }
+        }
       }
     }
@@ -1037 +1129 @@
 
 /**
+  Function try to find location of the Startup.nsh file.
+
+  The buffer is callee allocated and should be freed by the caller.
+
+  @param    ImageDevicePath       The path to the image for shell.  first place to look for the startup script
+  @param    FileDevicePath        The path to the file for shell.  second place to look for the startup script.
+
+  @retval   NULL                  No Startup.nsh file was found.
+  @return   !=NULL                Pointer to NULL-terminated path.
+**/
+CHAR16 *
+LocateStartupScript (
+  IN EFI_DEVICE_PATH_PROTOCOL *ImageDevicePath,
+  IN EFI_DEVICE_PATH_PROTOCOL *FileDevicePath
+  )
+{
+  CHAR16          *StartupScriptPath;
+  CHAR16          *TempSpot;
+  CONST CHAR16    *MapName;
+  UINTN           Size;
+
+  StartupScriptPath = NULL;
+  Size              = 0;
+
+  //
+  // Try to find 'Startup.nsh' in the directory where the shell itself was launched.
+  //
+  MapName = ShellInfoObject.NewEfiShellProtocol->GetMapFromDevicePath (&ImageDevicePath);
+  if (MapName != NULL) {
+    StartupScriptPath = StrnCatGrow (&StartupScriptPath, &Size, MapName, 0);
+    if (StartupScriptPath == NULL) {
+      //
+      // Do not locate the startup script in sys path when out of resource.
+      //
+      return NULL;
+    }
+    TempSpot = StrStr (StartupScriptPath, L";");
+    if (TempSpot != NULL) {
+      *TempSpot = CHAR_NULL;
+    }
+
+    StartupScriptPath = StrnCatGrow (&StartupScriptPath, &Size, ((FILEPATH_DEVICE_PATH *)FileDevicePath)->PathName, 0);
+    PathRemoveLastItem (StartupScriptPath);
+    StartupScriptPath = StrnCatGrow (&StartupScriptPath, &Size, mStartupScript, 0);
+  }
+
+  //
+  // Try to find 'Startup.nsh' in the execution path defined by the envrionment variable PATH.
+  //
+  if ((StartupScriptPath == NULL) || EFI_ERROR (ShellIsFile (StartupScriptPath))) {
+    SHELL_FREE_NON_NULL (StartupScriptPath);
+    StartupScriptPath = ShellFindFilePath (mStartupScript);
+  }
+
+  return StartupScriptPath;
+}
+
+/**
   Handles all interaction with the default startup script.
 
@@ -1047 +1197 @@
 **/
 EFI_STATUS
-EFIAPI
 DoStartupScript(
   IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,
@@ -1054 +1203 @@
 {
   EFI_STATUS                    Status;
+  EFI_STATUS                    CalleeStatus;
   UINTN                         Delay;
   EFI_INPUT_KEY                 Key;
-  SHELL_FILE_HANDLE             FileHandle;
-  EFI_DEVICE_PATH_PROTOCOL      *NewPath;
-  EFI_DEVICE_PATH_PROTOCOL      *NamePath;
   CHAR16                        *FileStringPath;
-  CHAR16                        *TempSpot;
   UINTN                         NewSize;
-  CONST CHAR16                  *MapName;
 
   Key.UnicodeChar = CHAR_NULL;
   Key.ScanCode    = 0;
-  FileHandle      = NULL;
 
   if (!ShellInfoObject.ShellInitSettings.BitUnion.Bits.Startup && ShellInfoObject.ShellInitSettings.FileName != NULL) {
@@ -1080 +1224 @@
       return (EFI_OUT_OF_RESOURCES);
     }
-    StrnCpy(FileStringPath, ShellInfoObject.ShellInitSettings.FileName, NewSize/sizeof(CHAR16) -1);
+    StrCpyS(FileStringPath, NewSize/sizeof(CHAR16), ShellInfoObject.ShellInitSettings.FileName);
     if (ShellInfoObject.ShellInitSettings.FileOptions != NULL) {
-      StrnCat(FileStringPath, L" ", NewSize/sizeof(CHAR16) - StrLen(FileStringPath) -1);
-      StrnCat(FileStringPath, ShellInfoObject.ShellInitSettings.FileOptions, NewSize/sizeof(CHAR16) - StrLen(FileStringPath) -1);
-    }
-    Status = RunCommand(FileStringPath);
+      StrnCatS(FileStringPath, NewSize/sizeof(CHAR16), L" ", NewSize/sizeof(CHAR16) - StrLen(FileStringPath) -1);
+      StrnCatS(FileStringPath, NewSize/sizeof(CHAR16), ShellInfoObject.ShellInitSettings.FileOptions, NewSize/sizeof(CHAR16) - StrLen(FileStringPath) -1);
+    }
+    Status = RunShellCommand(FileStringPath, &CalleeStatus);
+    if (ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit == TRUE) {
+      ShellCommandRegisterExit(gEfiShellProtocol->BatchIsActive(), (UINT64)CalleeStatus);
+    }
     FreePool(FileStringPath);
     return (Status);
@@ -1125 +1272 @@
   }
 
-  //
-  // Try the first location (must be file system)
-  //
-  MapName = ShellInfoObject.NewEfiShellProtocol->GetMapFromDevicePath(&ImagePath);
-  if (MapName != NULL) {
-    FileStringPath = NULL;
-    NewSize = 0;
-    FileStringPath = StrnCatGrow(&FileStringPath, &NewSize, MapName, 0);
-    if (FileStringPath == NULL) {
-      Status = EFI_OUT_OF_RESOURCES;
-    } else {
-      TempSpot = StrStr(FileStringPath, L";");
-      if (TempSpot != NULL) {
-        *TempSpot = CHAR_NULL;
-      }
-      FileStringPath = StrnCatGrow(&FileStringPath, &NewSize, ((FILEPATH_DEVICE_PATH*)FilePath)->PathName, 0);
-      PathRemoveLastItem(FileStringPath);
-      FileStringPath = StrnCatGrow(&FileStringPath, &NewSize, mStartupScript, 0);
-      Status = ShellInfoObject.NewEfiShellProtocol->OpenFileByName(FileStringPath, &FileHandle, EFI_FILE_MODE_READ);
-      FreePool(FileStringPath);
-    }
-  }
-  if (EFI_ERROR(Status)) {
-    NamePath = FileDevicePath (NULL, mStartupScript);
-    NewPath = AppendDevicePathNode (ImagePath, NamePath);
-    FreePool(NamePath);
-
-    //
-    // Try the location
-    //
-    Status = InternalOpenFileDevicePath(NewPath, &FileHandle, EFI_FILE_MODE_READ, 0);
-    FreePool(NewPath);
-  }
-  //
-  // If we got a file, run it
-  //
-  if (!EFI_ERROR(Status) && FileHandle != NULL) {
-    Status = RunScriptFile (mStartupScript, FileHandle, L"", ShellInfoObject.NewShellParametersProtocol);
-    ShellInfoObject.NewEfiShellProtocol->CloseFile(FileHandle);
+  FileStringPath = LocateStartupScript (ImagePath, FilePath);
+  if (FileStringPath != NULL) {
+    Status = RunScriptFile (FileStringPath, NULL, L"", ShellInfoObject.NewShellParametersProtocol);
+    FreePool (FileStringPath);
   } else {
-    FileStringPath = ShellFindFilePath(mStartupScript);
-    if (FileStringPath == NULL) {
-      //
-      // we return success since we dont need to have a startup script
-      //
-      Status = EFI_SUCCESS;
-      ASSERT(FileHandle == NULL);
-    } else {
-      Status = RunScriptFile(FileStringPath, NULL, L"", ShellInfoObject.NewShellParametersProtocol);
-      FreePool(FileStringPath);
-    }
-  }
-
+    //
+    // we return success since startup script is not mandatory.
+    //
+    Status = EFI_SUCCESS;
+  }
 
   return (Status);
@@ -1191 +1295 @@
 **/
 EFI_STATUS
-EFIAPI
 DoShellPrompt (
   VOID
@@ -1202 +1305 @@
   UINTN         BufferSize;
   EFI_STATUS    Status;
+  LIST_ENTRY    OldBufferList;
 
   CurDir  = NULL;
@@ -1215 +1319 @@
   }
 
+  SaveBufferList(&OldBufferList);
   CurDir = ShellInfoObject.NewEfiShellProtocol->GetEnv(L"cwd");
 
@@ -1237 +1342 @@
   //
   if (!EFI_ERROR (Status)) {
+    //
+    // Reset the CTRL-C event just before running the command (yes we ignore the return values)
+    //
+    Status = gBS->CheckEvent (ShellInfoObject.NewEfiShellProtocol->ExecutionBreak);
+
     CmdLine[BufferSize / sizeof (CHAR16)] = CHAR_NULL;
     Status = RunCommand(CmdLine);
-    }
+  }
 
   //
   // Done with this command
   //
+  RestoreBufferList(&OldBufferList);
   FreePool (CmdLine);
   return Status;
@@ -1255 +1366 @@
 **/
 VOID*
-EFIAPI
-AddBufferToFreeList(
+AddBufferToFreeList (
   VOID *Buffer
   )
@@ -1266 +1376 @@
   }
 
-  BufferListEntry = AllocateZeroPool(sizeof(BUFFER_LIST));
-  ASSERT(BufferListEntry != NULL);
+  BufferListEntry = AllocateZeroPool (sizeof (BUFFER_LIST));
+  if (BufferListEntry == NULL) {
+    return NULL;
+  }
+
   BufferListEntry->Buffer = Buffer;
-  InsertTailList(&ShellInfoObject.BufferToFreeList.Link, &BufferListEntry->Link);
+  InsertTailList (&ShellInfoObject.BufferToFreeList.Link, &BufferListEntry->Link);
   return (Buffer);
 }
 
+
+/**
+  Create a new buffer list and stores the old one to OldBufferList
+
+  @param OldBufferList   The temporary list head used to store the nodes in BufferToFreeList.
+**/
+VOID
+SaveBufferList (
+  OUT LIST_ENTRY     *OldBufferList
+  )
+{
+  CopyMem (OldBufferList, &ShellInfoObject.BufferToFreeList.Link, sizeof (LIST_ENTRY));
+  InitializeListHead (&ShellInfoObject.BufferToFreeList.Link);
+}
+
+/**
+  Restore previous nodes into BufferToFreeList .
+
+  @param OldBufferList   The temporary list head used to store the nodes in BufferToFreeList.
+**/
+VOID
+RestoreBufferList (
+  IN OUT LIST_ENTRY     *OldBufferList
+  )
+{
+  FreeBufferList (&ShellInfoObject.BufferToFreeList);
+  CopyMem (&ShellInfoObject.BufferToFreeList.Link, OldBufferList, sizeof (LIST_ENTRY));
+}
+
+
 /**
   Add a buffer to the Line History List
@@ -1279 +1422 @@
 **/
 VOID
-EFIAPI
 AddLineToCommandHistory(
   IN CONST CHAR16 *Buffer
@@ -1285 +1427 @@
 {
   BUFFER_LIST *Node;
+  BUFFER_LIST *Walker;
+  UINT16       MaxHistoryCmdCount;
+  UINT16       Count;
+
+  Count = 0;
+  MaxHistoryCmdCount = PcdGet16(PcdShellMaxHistoryCommandCount);
+
+  if (MaxHistoryCmdCount == 0) {
+    return ;
+  }
+
 
   Node = AllocateZeroPool(sizeof(BUFFER_LIST));
-  ASSERT(Node != NULL);
-  Node->Buffer = AllocateCopyPool(StrSize(Buffer), Buffer);
-  ASSERT(Node->Buffer != NULL);
-
-  InsertTailList(&ShellInfoObject.ViewingSettings.CommandHistory.Link, &Node->Link);
+  if (Node == NULL) {
+    return;
+  }
+
+  Node->Buffer = AllocateCopyPool (StrSize (Buffer), Buffer);
+  if (Node->Buffer == NULL) {
+    FreePool (Node);
+    return;
+  }
+
+  for ( Walker = (BUFFER_LIST*)GetFirstNode(&ShellInfoObject.ViewingSettings.CommandHistory.Link)
+      ; !IsNull(&ShellInfoObject.ViewingSettings.CommandHistory.Link, &Walker->Link)
+      ; Walker = (BUFFER_LIST*)GetNextNode(&ShellInfoObject.ViewingSettings.CommandHistory.Link, &Walker->Link)
+   ){
+    Count++;
+  }
+  if (Count < MaxHistoryCmdCount){
+    InsertTailList(&ShellInfoObject.ViewingSettings.CommandHistory.Link, &Node->Link);
+  } else {
+    Walker = (BUFFER_LIST*)GetFirstNode(&ShellInfoObject.ViewingSettings.CommandHistory.Link);
+    RemoveEntryList(&Walker->Link);
+    if (Walker->Buffer != NULL) {
+      FreePool(Walker->Buffer);
+    }
+    FreePool(Walker);
+    InsertTailList(&ShellInfoObject.ViewingSettings.CommandHistory.Link, &Node->Link);
+  }
 }
 
@@ -1308 +1483 @@
 **/
 EFI_STATUS
-EFIAPI
 ShellConvertAlias(
   IN OUT CHAR16 **CommandString
@@ -1333 +1507 @@
 **/
 EFI_STATUS
-EFIAPI
 StripUnreplacedEnvironmentVariables(
   IN OUT CHAR16 *CmdLine
@@ -1350 +1523 @@
     if (FirstPercent == NULL || SecondPercent == NULL) {
       //
-      // If we ever dont have 2 % we are done.
+      // If we ever don't have 2 % we are done.
       //
       break;
@@ -1382 +1555 @@
         CopyMem(FirstPercent, SecondPercent + 1, StrSize(SecondPercent + 1));
         //
-        // dont need to update the locator.  both % characters are gone.
+        // don't need to update the locator.  both % characters are gone.
         //
       } else {
@@ -1402 +1575 @@
   @param[in] OriginalCommandLine    The original command line
 
-  @retval NULL                      An error ocurred.
+  @retval NULL                      An error occurred.
   @return                           The new command line with no environment variables present.
 **/
 CHAR16*
-EFIAPI
 ShellConvertVariables (
   IN CONST CHAR16 *OriginalCommandLine
@@ -1443 +1615 @@
        ){
         //
-        // we need a preceeding and if there is space no ^ preceeding (if no space ignore)
+        // we need a preceding and if there is space no ^ preceding (if no space ignore)
         //
         if ((((Temp-OriginalCommandLine)>2) && *(Temp-2) != L'^') || ((Temp-OriginalCommandLine)<=2)) {
@@ -1464 +1636 @@
      ){
       //
-      // we need a preceeding and following % and if there is space no ^ preceeding (if no space ignore)
+      // we need a preceding and following % and if there is space no ^ preceding (if no space ignore)
       //
       if (*(Temp-1) == L'%' && *(Temp+StrLen(MasterEnvList)) == L'%' &&
@@ -1476 +1648 @@
   // now do the replacements...
   //
-  NewCommandLine1 = AllocateCopyPool(NewSize, OriginalCommandLine);
+  NewCommandLine1 = AllocateZeroPool (NewSize);
   NewCommandLine2 = AllocateZeroPool(NewSize);
   ItemTemp        = AllocateZeroPool(ItemSize+(2*sizeof(CHAR16)));
@@ -1485 +1657 @@
     return (NULL);
   }
+  CopyMem (NewCommandLine1, OriginalCommandLine, StrSize (OriginalCommandLine));
+
   for (MasterEnvList = EfiShellGetEnv(NULL)
     ;  MasterEnvList != NULL && *MasterEnvList != CHAR_NULL
     ;  MasterEnvList += StrLen(MasterEnvList) + 1
    ){
-    StrnCpy(ItemTemp, L"%", ((ItemSize+(2*sizeof(CHAR16)))/sizeof(CHAR16))-1);
-    StrnCat(ItemTemp, MasterEnvList, ((ItemSize+(2*sizeof(CHAR16)))/sizeof(CHAR16))-1 - StrLen(ItemTemp));
-    StrnCat(ItemTemp, L"%", ((ItemSize+(2*sizeof(CHAR16)))/sizeof(CHAR16))-1 - StrLen(ItemTemp));
+    StrCpyS( ItemTemp,
+              ((ItemSize+(2*sizeof(CHAR16)))/sizeof(CHAR16)),
+              L"%"
+              );
+    StrCatS( ItemTemp,
+              ((ItemSize+(2*sizeof(CHAR16)))/sizeof(CHAR16)),
+              MasterEnvList
+              );
+    StrCatS( ItemTemp,
+              ((ItemSize+(2*sizeof(CHAR16)))/sizeof(CHAR16)),
+              L"%"
+              );
     ShellCopySearchAndReplace(NewCommandLine1, NewCommandLine2, NewSize, ItemTemp, EfiShellGetEnv(MasterEnvList), TRUE, FALSE);
-    StrnCpy(NewCommandLine1, NewCommandLine2, NewSize/sizeof(CHAR16)-1);
+    StrCpyS(NewCommandLine1, NewSize/sizeof(CHAR16), NewCommandLine2);
   }
   if (CurrentScriptFile != NULL) {
@@ -1501 +1684 @@
    ){
     ShellCopySearchAndReplace(NewCommandLine1, NewCommandLine2, NewSize, AliasListNode->Alias, AliasListNode->CommandString, TRUE, FALSE);
-    StrnCpy(NewCommandLine1, NewCommandLine2, NewSize/sizeof(CHAR16)-1);
-    }
-  }
-
-  //
-  // Remove non-existant environment variables
+    StrCpyS(NewCommandLine1, NewSize/sizeof(CHAR16), NewCommandLine2);
+    }
+  }
+
+  //
+  // Remove non-existent environment variables
   //
   StripUnreplacedEnvironmentVariables(NewCommandLine1);
@@ -1514 +1697 @@
   //
   ShellCopySearchAndReplace(NewCommandLine1, NewCommandLine2, NewSize, L"^%", L"%", TRUE, FALSE);
-  StrnCpy(NewCommandLine1, NewCommandLine2, NewSize/sizeof(CHAR16)-1);
+  StrCpyS(NewCommandLine1, NewSize/sizeof(CHAR16), NewCommandLine2);
 
   FreePool(NewCommandLine2);
@@ -1533 +1716 @@
 **/
 EFI_STATUS
-EFIAPI
 RunSplitCommand(
   IN CONST CHAR16             *CmdLine,
-  IN       SHELL_FILE_HANDLE  *StdIn,
-  IN       SHELL_FILE_HANDLE  *StdOut
+  IN       SHELL_FILE_HANDLE  StdIn,
+  IN       SHELL_FILE_HANDLE  StdOut
   )
 {
@@ -1546 +1728 @@
   UINTN             Size2;
   SPLIT_LIST        *Split;
-  SHELL_FILE_HANDLE *TempFileHandle;
+  SHELL_FILE_HANDLE TempFileHandle;
   BOOLEAN           Unicode;
 
@@ -1570 +1752 @@
     SHELL_FREE_NON_NULL(NextCommandLine);
     return (EFI_INVALID_PARAMETER);
-  } else if (NextCommandLine[0] != CHAR_NULL &&
-      NextCommandLine[0] == L'a' &&
-      NextCommandLine[1] == L' '
-     ){
+  } else if (NextCommandLine[0] == L'a' &&
+             (NextCommandLine[1] == L' ' || NextCommandLine[1] == CHAR_NULL)
+            ){
     CopyMem(NextCommandLine, NextCommandLine+1, StrSize(NextCommandLine) - sizeof(NextCommandLine[0]));
+    while (NextCommandLine[0] == L' ') {
+      CopyMem(NextCommandLine, NextCommandLine+1, StrSize(NextCommandLine) - sizeof(NextCommandLine[0]));
+    }
+    if (NextCommandLine[0] == CHAR_NULL) {
+      SHELL_FREE_NON_NULL(OurCommandLine);
+      SHELL_FREE_NON_NULL(NextCommandLine);
+      return (EFI_INVALID_PARAMETER);
+    }
     Unicode = FALSE;
   } else {
@@ -1585 +1774 @@
   //
   Split = AllocateZeroPool(sizeof(SPLIT_LIST));
-  ASSERT(Split != NULL);
+  if (Split == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
   Split->SplitStdIn   = StdIn;
   Split->SplitStdOut  = ConvertEfiFileProtocolToShellHandle(CreateFileInterfaceMem(Unicode), NULL);
@@ -1603 +1794 @@
   }
   Split->SplitStdIn   = TempFileHandle;
-  ShellInfoObject.NewEfiShellProtocol->SetFilePosition(ConvertShellHandleToEfiFileProtocol(Split->SplitStdIn), 0);
+  ShellInfoObject.NewEfiShellProtocol->SetFilePosition (Split->SplitStdIn, 0);
 
   if (!EFI_ERROR(Status)) {
@@ -1618 +1809 @@
   // Note that the original StdIn is now the StdOut...
   //
-  if (Split->SplitStdOut != NULL && Split->SplitStdOut != StdIn) {
-    ShellInfoObject.NewEfiShellProtocol->CloseFile(ConvertShellHandleToEfiFileProtocol(Split->SplitStdOut));
+  if (Split->SplitStdOut != NULL) {
+    ShellInfoObject.NewEfiShellProtocol->CloseFile (Split->SplitStdOut);
   }
   if (Split->SplitStdIn != NULL) {
-    ShellInfoObject.NewEfiShellProtocol->CloseFile(ConvertShellHandleToEfiFileProtocol(Split->SplitStdIn));
+    ShellInfoObject.NewEfiShellProtocol->CloseFile (Split->SplitStdIn);
   }
 
@@ -1642 +1833 @@
 **/
 EFI_STATUS
-EFIAPI
 ShellSubstituteVariables(
   IN CHAR16 **CmdLine
@@ -1667 +1857 @@
 **/
 EFI_STATUS
-EFIAPI
 ShellSubstituteAliases(
   IN CHAR16 **CmdLine
@@ -1739 +1928 @@
 **/
 SHELL_OPERATION_TYPES
-EFIAPI
 GetOperationType(
   IN CONST CHAR16 *CmdName
@@ -1808 +1996 @@
 **/
 EFI_STATUS
-EFIAPI
 IsValidSplit(
   IN CONST CHAR16 *CmdLine
@@ -1844 +2031 @@
     }
     TempWalker = (CHAR16*)Temp;
-    if (!EFI_ERROR(GetNextParameter(&TempWalker, &FirstParameter, StrSize(CmdLine)))) {
+    if (!EFI_ERROR(GetNextParameter(&TempWalker, &FirstParameter, StrSize(CmdLine), TRUE))) {
       if (GetOperationType(FirstParameter) == Unknown_Invalid) {
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_NOT_FOUND), ShellInfoObject.HiiHandle, FirstParameter);
@@ -1867 +2054 @@
 **/
 EFI_STATUS
-EFIAPI
 VerifySplit(
   IN CONST CHAR16 *CmdLine
@@ -1874 +2060 @@
   CONST CHAR16  *TempSpot;
   EFI_STATUS    Status;
+
+  //
+  // If this was the only item, then get out
+  //
+  if (!ContainsSplit(CmdLine)) {
+    return (EFI_SUCCESS);
+  }
 
   //
@@ -1884 +2077 @@
 
   //
-  // If this was the only item, then get out
-  //
-  if (!ContainsSplit(CmdLine)) {
-    return (EFI_SUCCESS);
-  }
-
-  //
   // recurse to verify the next item
   //
   TempSpot = FindFirstCharacter(CmdLine, L"|", L'^') + 1;
+  if (*TempSpot == L'a' &&
+      (*(TempSpot + 1) == L' ' || *(TempSpot + 1) == CHAR_NULL)
+     ) {
+    // If it's an ASCII pipe '|a'
+    TempSpot += 1;
+  }
+
   return (VerifySplit(TempSpot));
 }
@@ -1903 +2096 @@
 
   @retval EFI_SUCCESS   The operation was successful
-  @return               an error occured.
+  @return               an error occurred.
 **/
 EFI_STATUS
-EFIAPI
 ProcessNewSplitCommandLine(
   IN CONST CHAR16 *CmdLine
@@ -1947 +2139 @@
 **/
 EFI_STATUS
-EFIAPI
 ChangeMappedDrive(
   IN CONST CHAR16 *CmdLine
@@ -1983 +2174 @@
 **/
 EFI_STATUS
-EFIAPI
 DoHelpUpdate(
   IN OUT CHAR16 **CmdLine
@@ -1990 +2180 @@
   CHAR16 *CurrentParameter;
   CHAR16 *Walker;
-  CHAR16 *LastWalker;
   CHAR16 *NewCommandLine;
   EFI_STATUS Status;
+  UINTN  NewCmdLineSize;
 
   Status = EFI_SUCCESS;
@@ -2003 +2193 @@
   Walker = *CmdLine;
   while(Walker != NULL && *Walker != CHAR_NULL) {
-    LastWalker = Walker;
-    if (!EFI_ERROR(GetNextParameter(&Walker, &CurrentParameter, StrSize(*CmdLine)))) {
+    if (!EFI_ERROR(GetNextParameter(&Walker, &CurrentParameter, StrSize(*CmdLine), TRUE))) {
       if (StrStr(CurrentParameter, L"-?") == CurrentParameter) {
-        LastWalker[0] = L' ';
-        LastWalker[1] = L' ';
-        NewCommandLine = AllocateZeroPool(StrSize(L"help ") + StrSize(*CmdLine));
+        CurrentParameter[0] = L' ';
+        CurrentParameter[1] = L' ';
+        NewCmdLineSize = StrSize(L"help ") + StrSize(*CmdLine);
+        NewCommandLine = AllocateZeroPool(NewCmdLineSize);
         if (NewCommandLine == NULL) {
           Status = EFI_OUT_OF_RESOURCES;
@@ -2017 +2207 @@
         // We know the space is sufficient since we just calculated it.
         //
-        StrnCpy(NewCommandLine, L"help ", 5);
-        StrnCat(NewCommandLine, *CmdLine, StrLen(*CmdLine));
+        StrnCpyS(NewCommandLine, NewCmdLineSize/sizeof(CHAR16), L"help ", 5);
+        StrnCatS(NewCommandLine, NewCmdLineSize/sizeof(CHAR16), *CmdLine, StrLen(*CmdLine));
         SHELL_FREE_NON_NULL(*CmdLine);
         *CmdLine = NewCommandLine;
@@ -2037 +2227 @@
 **/
 EFI_STATUS
-EFIAPI
 SetLastError(
   IN CONST SHELL_STATUS   ErrorCode
@@ -2061 +2250 @@
   @retval EFI_SUCCESS           The operation was successful
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @return                       some other error occured
+  @return                       some other error occurred
 **/
 EFI_STATUS
-EFIAPI
 ProcessCommandLineToFinal(
   IN OUT CHAR16 **CmdLine
@@ -2106 +2294 @@
   Run an internal shell command.
 
-  This API will upadate the shell's environment since these commands are libraries.
+  This API will update 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
   @param[in] ParamProtocol    the shell parameters protocol pointer
+  @param[out] CommandStatus   the status from the command line.
 
   @retval EFI_SUCCESS     The command was completed.
@@ -2116 +2305 @@
 **/
 EFI_STATUS
-EFIAPI
 RunInternalCommand(
   IN CONST CHAR16                   *CmdLine,
   IN       CHAR16                   *FirstParameter,
-  IN EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol
+  IN EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol,
+  OUT EFI_STATUS                    *CommandStatus
 )
 {
@@ -2145 +2334 @@
   // get the argc and argv updated for internal commands
   //
-  Status = UpdateArgcArgv(ParamProtocol, NewCmdLine, &Argv, &Argc);
+  Status = UpdateArgcArgv(ParamProtocol, NewCmdLine, Internal_Command, &Argv, &Argc);
   if (!EFI_ERROR(Status)) {
     //
@@ -2153 +2342 @@
 
     if (!EFI_ERROR(Status)) {
+      if (CommandStatus != NULL) {
+        if (CommandReturnedStatus != SHELL_SUCCESS) {
+          *CommandStatus = (EFI_STATUS)(CommandReturnedStatus | MAX_BIT);
+        } else {
+          *CommandStatus = EFI_SUCCESS;
+        }
+      }
+
       //
       // Update last error status.
@@ -2184 +2381 @@
 
   //
-  // This is guarenteed to be called after UpdateArgcArgv no matter what else happened.
+  // This is guaranteed to be called after UpdateArgcArgv no matter what else happened.
   // This is safe even if the update API failed.  In this case, it may be a no-op.
   //
@@ -2190 +2387 @@
 
   //
-  // If a script is running and the command is not a scipt only command, then
+  // If a script is running and the command is not a script only command, then
   // change return value to success so the script won't halt (unless aborted).
   //
@@ -2214 +2411 @@
   @param[in] FirstParameter   the first parameter on the command line
   @param[in] ParamProtocol    the shell parameters protocol pointer
+  @param[out] CommandStatus   the status from the command line.
 
   @retval EFI_SUCCESS     The command was completed.
@@ -2219 +2417 @@
 **/
 EFI_STATUS
-EFIAPI
 RunCommandOrFile(
   IN       SHELL_OPERATION_TYPES    Type,
   IN CONST CHAR16                   *CmdLine,
   IN       CHAR16                   *FirstParameter,
-  IN EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol
+  IN EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol,
+  OUT EFI_STATUS                    *CommandStatus
 )
 {
@@ -2240 +2438 @@
   switch (Type) {
     case   Internal_Command:
-      Status = RunInternalCommand(CmdLine, FirstParameter, ParamProtocol);
+      Status = RunInternalCommand(CmdLine, FirstParameter, ParamProtocol, CommandStatus);
       break;
     case   Script_File_Name:
@@ -2306 +2504 @@
           }
 
+          if (CommandStatus != NULL) {
+            *CommandStatus = CalleeExitStatus;
+          }
+
           //
           // Update last error status.
@@ -2338 +2540 @@
   @param[in] FirstParameter   the first parameter on the command line.
   @param[in] ParamProtocol    the shell parameters protocol pointer
+  @param[out] CommandStatus   the status from the command line.
 
   @retval EFI_SUCCESS     The command was completed.
@@ -2343 +2546 @@
 **/
 EFI_STATUS
-EFIAPI
 SetupAndRunCommandOrFile(
-  IN SHELL_OPERATION_TYPES          Type,
-  IN CHAR16                         *CmdLine,
-  IN CHAR16                         *FirstParameter,
-  IN EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol
+  IN   SHELL_OPERATION_TYPES          Type,
+  IN   CHAR16                         *CmdLine,
+  IN   CHAR16                         *FirstParameter,
+  IN   EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol,
+  OUT EFI_STATUS                      *CommandStatus
 )
 {
@@ -2356 +2559 @@
   SHELL_FILE_HANDLE         OriginalStdErr;
   SYSTEM_TABLE_INFO         OriginalSystemTableInfo;
+  CONST SCRIPT_FILE         *ConstScriptFile;
 
   //
@@ -2368 +2572 @@
   if (!EFI_ERROR(Status)) {
     TrimSpaces(&CmdLine);
-    Status = RunCommandOrFile(Type, CmdLine, FirstParameter, ParamProtocol);
+    Status = RunCommandOrFile(Type, CmdLine, FirstParameter, ParamProtocol, CommandStatus);
   }
 
@@ -2375 +2579 @@
   //
   if (EFI_ERROR(Status)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR), ShellInfoObject.HiiHandle, (VOID*)(Status));
+    ConstScriptFile = ShellCommandGetCurrentScriptFile();
+    if (ConstScriptFile == NULL || ConstScriptFile->CurrentCommand == NULL) {
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR), ShellInfoObject.HiiHandle, (VOID*)(Status));
+    } else {
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR_SCRIPT), ShellInfoObject.HiiHandle, (VOID*)(Status), ConstScriptFile->CurrentCommand->Line);
+    }
   }
 
@@ -2393 +2602 @@
 
   @param[in] CmdLine      The command line to parse.
+  @param[out] CommandStatus   The status from the command line.
 
   @retval EFI_SUCCESS     The command was completed.
@@ -2398 +2608 @@
 **/
 EFI_STATUS
-EFIAPI
-RunCommand(
-  IN CONST CHAR16   *CmdLine
+RunShellCommand(
+  IN CONST CHAR16   *CmdLine,
+  OUT EFI_STATUS    *CommandStatus
   )
 {
@@ -2408 +2618 @@
   CHAR16                    *TempWalker;
   SHELL_OPERATION_TYPES     Type;
+  CONST CHAR16              *CurDir;
 
   ASSERT(CmdLine != NULL);
@@ -2428 +2639 @@
   // The # character on a line is used to denote that all characters on the same line
   // and to the right of the # are to be ignored by the shell.
-  // Afterward, again remove spaces, in case any were between the last command-parameter and '#'.
+  // Afterwards, again remove spaces, in case any were between the last command-parameter and '#'.
   //
   for (TempWalker = CleanOriginal; TempWalker != NULL && *TempWalker != CHAR_NULL; TempWalker++) {
@@ -2457 +2668 @@
 
   //
-  // We dont do normal processing with a split command line (output from one command input to another)
+  // We don't do normal processing with a split command line (output from one command input to another)
   //
   if (ContainsSplit(CleanOriginal)) {
@@ -2474 +2685 @@
   }
   TempWalker = CleanOriginal;
-  if (!EFI_ERROR(GetNextParameter(&TempWalker, &FirstParameter, StrSize(CleanOriginal)))) {
+  if (!EFI_ERROR(GetNextParameter(&TempWalker, &FirstParameter, StrSize(CleanOriginal), TRUE))) {
     //
     // Depending on the first parameter we change the behavior
@@ -2485 +2696 @@
       case   Script_File_Name:
       case   Efi_Application:
-        Status = SetupAndRunCommandOrFile(Type, CleanOriginal, FirstParameter, ShellInfoObject.NewShellParametersProtocol);
+        Status = SetupAndRunCommandOrFile(Type, CleanOriginal, FirstParameter, ShellInfoObject.NewShellParametersProtocol, CommandStatus);
         break;
       default:
@@ -2499 +2710 @@
     SetLastError(SHELL_NOT_FOUND);
   }
+  //
+  // Check whether the current file system still exists. If not exist, we need update "cwd" and gShellCurMapping.
+  //
+  CurDir = EfiShellGetCurDir (NULL);
+  if (CurDir != NULL) {
+    if (EFI_ERROR(ShellFileExists (CurDir))) {
+      //
+      // EfiShellSetCurDir() cannot set current directory to NULL.
+      // EfiShellSetEnv() is not allowed to set the "cwd" variable.
+      // Only InternalEfiShellSetEnv () is allowed setting the "cwd" variable.
+      //
+      InternalEfiShellSetEnv (L"cwd", NULL, TRUE);
+      gShellCurMapping = NULL;
+    }
+  }
 
   SHELL_FREE_NON_NULL(CleanOriginal);
@@ -2506 +2732 @@
 }
 
+/**
+  Function will process and run a command line.
+
+  This will determine if the command line represents an internal shell
+  command or dispatch an external application.
+
+  @param[in] CmdLine      The command line to parse.
+
+  @retval EFI_SUCCESS     The command was completed.
+  @retval EFI_ABORTED     The command's operation was aborted.
+**/
+EFI_STATUS
+RunCommand(
+  IN CONST CHAR16   *CmdLine
+  )
+{
+  return (RunShellCommand(CmdLine, NULL));
+}
+
+
 STATIC CONST UINT16 InvalidChars[] = {L'*', L'?', L'<', L'>', L'\\', L'/', L'\"', 0x0001, 0x0002};
 /**
-  Function determins if the CommandName COULD be a valid command.  It does not determine whether
+  Function determines if the CommandName COULD be a valid command.  It does not determine whether
   this is a valid command.  It only checks for invalid characters.
 
@@ -2517 +2763 @@
 **/
 BOOLEAN
-EFIAPI
 IsValidCommandName(
   IN CONST CHAR16     *CommandName
@@ -2544 +2789 @@
   @param[in] Name               The name of the script file.
 
-  @retval EFI_SUCCESS           the script completed sucessfully
+  @retval EFI_SUCCESS           the script completed successfully
 **/
 EFI_STATUS
-EFIAPI
 RunScriptFileHandle (
   IN SHELL_FILE_HANDLE  Handle,
@@ -2556 +2800 @@
   SCRIPT_FILE         *NewScriptFile;
   UINTN               LoopVar;
+  UINTN               PrintBuffSize;
   CHAR16              *CommandLine;
   CHAR16              *CommandLine2;
@@ -2566 +2811 @@
   UINTN               LineCount;
   CHAR16              LeString[50];
+  LIST_ENTRY          OldBufferList;
 
   ASSERT(!ShellCommandGetScriptExit());
 
   PreScriptEchoState = ShellCommandGetEchoState();
+  PrintBuffSize = PcdGet16(PcdShellPrintBufferSize);
 
   NewScriptFile = (SCRIPT_FILE*)AllocateZeroPool(sizeof(SCRIPT_FILE));
@@ -2644 +2891 @@
   // Now enumerate through the commands and run each one.
   //
-  CommandLine = AllocateZeroPool(PcdGet16(PcdShellPrintBufferSize));
+  CommandLine = AllocateZeroPool(PrintBuffSize);
   if (CommandLine == NULL) {
     DeleteScriptFileStruct(NewScriptFile);
     return (EFI_OUT_OF_RESOURCES);
   }
-  CommandLine2 = AllocateZeroPool(PcdGet16(PcdShellPrintBufferSize));
+  CommandLine2 = AllocateZeroPool(PrintBuffSize);
   if (CommandLine2 == NULL) {
     FreePool(CommandLine);
@@ -2661 +2908 @@
   ){
     ASSERT(CommandLine2 != NULL);
-    StrnCpy(CommandLine2, NewScriptFile->CurrentCommand->Cl, PcdGet16(PcdShellPrintBufferSize)/sizeof(CHAR16)-1);
+    StrnCpyS( CommandLine2,
+              PrintBuffSize/sizeof(CHAR16),
+              NewScriptFile->CurrentCommand->Cl,
+              PrintBuffSize/sizeof(CHAR16) - 1
+              );
+
+    SaveBufferList(&OldBufferList);
 
     //
@@ -2682 +2935 @@
       // Due to variability in starting the find and replace action we need to have both buffers the same.
       //
-      StrnCpy(CommandLine, CommandLine2, PcdGet16(PcdShellPrintBufferSize)/sizeof(CHAR16)-1);
+      StrnCpyS( CommandLine,
+                PrintBuffSize/sizeof(CHAR16),
+                CommandLine2,
+                PrintBuffSize/sizeof(CHAR16) - 1
+                );
 
       //
@@ -2690 +2947 @@
         switch (NewScriptFile->Argc) {
           default:
-            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%9", NewScriptFile->Argv[9], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%9", NewScriptFile->Argv[9], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 9:
-            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%8", NewScriptFile->Argv[8], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%8", NewScriptFile->Argv[8], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 8:
-            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%7", NewScriptFile->Argv[7], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%7", NewScriptFile->Argv[7], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 7:
-            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%6", NewScriptFile->Argv[6], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%6", NewScriptFile->Argv[6], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 6:
-            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%5", NewScriptFile->Argv[5], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%5", NewScriptFile->Argv[5], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 5:
-            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%4", NewScriptFile->Argv[4], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%4", NewScriptFile->Argv[4], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 4:
-            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%3", NewScriptFile->Argv[3], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%3", NewScriptFile->Argv[3], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 3:
-            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%2", NewScriptFile->Argv[2], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%2", NewScriptFile->Argv[2], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 2:
-            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%1", NewScriptFile->Argv[1], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%1", NewScriptFile->Argv[1], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
           case 1:
-            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%0", NewScriptFile->Argv[0], FALSE, TRUE);
+            Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%0", NewScriptFile->Argv[0], FALSE, FALSE);
             ASSERT_EFI_ERROR(Status);
             break;
@@ -2724 +2981 @@
         }
       }
-      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%1", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%2", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%3", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%4", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%5", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%6", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%7", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PcdGet16 (PcdShellPrintBufferSize), L"%8", L"\"\"", FALSE, FALSE);
-      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PcdGet16 (PcdShellPrintBufferSize), L"%9", L"\"\"", FALSE, FALSE);
-
-      StrnCpy(CommandLine2, CommandLine, PcdGet16(PcdShellPrintBufferSize)/sizeof(CHAR16)-1);
+      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%1", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%2", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%3", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%4", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%5", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%6", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%7", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine,  CommandLine2, PrintBuffSize, L"%8", L"\"\"", FALSE, FALSE);
+      Status = ShellCopySearchAndReplace(CommandLine2,  CommandLine, PrintBuffSize, L"%9", L"\"\"", FALSE, FALSE);
+
+      StrnCpyS( CommandLine2,
+                PrintBuffSize/sizeof(CHAR16),
+                CommandLine,
+                PrintBuffSize/sizeof(CHAR16) - 1
+                );
 
       LastCommand = NewScriptFile->CurrentCommand;
@@ -2789 +3050 @@
           ShellCommandRegisterExit(FALSE, 0);
           Status = EFI_SUCCESS;
+          RestoreBufferList(&OldBufferList);
           break;
         }
         if (ShellGetExecutionBreakFlag()) {
+          RestoreBufferList(&OldBufferList);
           break;
         }
         if (EFI_ERROR(Status)) {
+          RestoreBufferList(&OldBufferList);
           break;
         }
         if (ShellCommandGetExit()) {
+          RestoreBufferList(&OldBufferList);
           break;
         }
@@ -2816 +3081 @@
       }
     }
+    RestoreBufferList(&OldBufferList);
   }
 
@@ -2840 +3106 @@
   @param[in] ParamProtocol      the shell parameters protocol pointer
 
-  @retval EFI_SUCCESS           the script completed sucessfully
+  @retval EFI_SUCCESS           the script completed successfully
 **/
 EFI_STATUS
-EFIAPI
 RunScriptFile (
   IN CONST CHAR16                   *ScriptPath,
@@ -2863 +3128 @@
   // get the argc and argv updated for scripts
   //
-  Status = UpdateArgcArgv(ParamProtocol, CmdLine, &Argv, &Argc);
+  Status = UpdateArgcArgv(ParamProtocol, CmdLine, Script_File_Name, &Argv, &Argc);
   if (!EFI_ERROR(Status)) {
 
@@ -2888 +3153 @@
 
   //
-  // This is guarenteed to be called after UpdateArgcArgv no matter what else happened.
+  // This is guaranteed to be called after UpdateArgcArgv no matter what else happened.
   // This is safe even if the update API failed.  In this case, it may be a no-op.
   //
@@ -2897 +3162 @@
 
 /**
-  Return the pointer to the first occurance of any character from a list of characters
+  Return the pointer to the first occurrence of any character from a list of characters.
 
   @param[in] String           the string to parse
@@ -2907 +3172 @@
 **/
 CONST CHAR16*
-EFIAPI
 FindFirstCharacter(
   IN CONST CHAR16 *String,

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/Shell.h

@@ -2 +2 @@
   function definitions for internal to shell functions.
 
-  (C) Copyright 2014, Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -18 +18 @@
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellVariableGuid.h>
@@ -25 +24 @@
 #include <Protocol/LoadedImage.h>
 #include <Protocol/SimpleTextOut.h>
-#include <Protocol/EfiShell.h>
+#include <Protocol/Shell.h>
 #include <Protocol/EfiShellInterface.h>
 #include <Protocol/EfiShellEnvironment2.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/BlockIo.h>
+#include <Protocol/HiiPackageList.h>
 
 #include <Library/BaseLib.h>
@@ -47 +47 @@
 #include <Library/PrintLib.h>
 #include <Library/HandleParsingLib.h>
-#include <Library/PathLib.h>
 #include <Library/FileHandleLib.h>
+#include <Library/UefiHiiServicesLib.h>
 
 #include "ShellParametersProtocol.h"
@@ -58 +58 @@
 #include "FileHandleWrappers.h"
 
+extern CONST CHAR16 mNoNestingEnvVarName[];
+extern CONST CHAR16 mNoNestingTrue[];
+extern CONST CHAR16 mNoNestingFalse[];
+
 typedef struct {
   LIST_ENTRY        Link;           ///< Standard linked list handler.
-  SHELL_FILE_HANDLE *SplitStdOut;   ///< ConsoleOut for use in the split.
-  SHELL_FILE_HANDLE *SplitStdIn;    ///< ConsoleIn for use in the split.
+  SHELL_FILE_HANDLE SplitStdOut;    ///< ConsoleOut for use in the split.
+  SHELL_FILE_HANDLE SplitStdIn;     ///< ConsoleIn for use in the split.
 } SPLIT_LIST;
 
@@ -73 +77 @@
   UINT32  NoVersion:1;    ///< Was "-noversion"     found on command line.
   UINT32  Delay:1;        ///< Was "-delay[:n]      found on command line
-  UINT32  Exit:1;         ///< Was "-_exit"          found on command line
+  UINT32  Exit:1;         ///< Was "-_exit"         found on command line
+  UINT32  NoNest:1;       ///< Was "-nonest"        found on command line
   UINT32  Reserved:7;     ///< Extra bits
 } SHELL_BITS;
@@ -124 +129 @@
 } SHELL_INFO;
 
+#pragma pack(1)
+///
+/// HII specific Vendor Device Path definition.
+///
+typedef struct {
+  VENDOR_DEVICE_PATH             VendorDevicePath;
+  EFI_DEVICE_PATH_PROTOCOL       End;
+} SHELL_MAN_HII_VENDOR_DEVICE_PATH;
+#pragma pack()
+
 extern SHELL_INFO ShellInfoObject;
-
-typedef enum {
-  Internal_Command,
-  Script_File_Name,
-  Efi_Application,
-  File_Sys_Change,
-  Unknown_Invalid
-} SHELL_OPERATION_TYPES;
 
 /**
@@ -141 +148 @@
   @retval EFI_SUCCESS           The operation was successful
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @return                       some other error occured
-**/
-EFI_STATUS
-EFIAPI
+  @return                       some other error occurred
+**/
+EFI_STATUS
 ProcessCommandLineToFinal(
   IN OUT CHAR16 **CmdLine
@@ -155 +161 @@
 **/
 EFI_STATUS
-EFIAPI
 SetLastError(
   IN CONST SHELL_STATUS   ErrorCode
@@ -163 +168 @@
   Sets all the alias' that were registered with the ShellCommandLib library.
 
-  @retval EFI_SUCCESS           all init commands were run sucessfully.
-**/
-EFI_STATUS
-EFIAPI
+  @retval EFI_SUCCESS           all init commands were run successfully.
+**/
+EFI_STATUS
 SetBuiltInAlias(
   VOID
@@ -177 +181 @@
   for the file that was loaded.
 
-  @param[in, out] DevPath       on a sucessful return the device path to the loaded image
-  @param[in, out] FilePath      on a sucessful return the device path to the file
-
-  @retval EFI_SUCCESS           the 2 device paths were sucessfully returned.
+  @param[in, out] DevPath       on a successful return the device path to the loaded image
+  @param[in, out] FilePath      on a successful return the device path to the file
+
+  @retval EFI_SUCCESS           the 2 device paths were successfully returned.
   @return other                 a error from gBS->HandleProtocol
 
@@ -186 +190 @@
 **/
 EFI_STATUS
-EFIAPI
 GetDevicePathsForImageAndFile (
   IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,
@@ -220 +223 @@
 **/
 EFI_STATUS
-EFIAPI
 ProcessCommandLine(
   VOID
@@ -236 +238 @@
 **/
 EFI_STATUS
-EFIAPI
 DoStartupScript(
   IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,
@@ -251 +252 @@
 **/
 EFI_STATUS
-EFIAPI
 DoShellPrompt (
   VOID
@@ -263 +263 @@
 **/
 VOID*
-EFIAPI
 AddBufferToFreeList(
   VOID *Buffer
@@ -274 +273 @@
 **/
 VOID
-EFIAPI
 AddLineToCommandHistory(
   IN CONST CHAR16 *Buffer
@@ -290 +288 @@
 **/
 EFI_STATUS
-EFIAPI
 RunCommand(
   IN CONST CHAR16   *CmdLine
@@ -296 +293 @@
 
 /**
-  Function determins if the CommandName COULD be a valid command.  It does not determine whether
+  Function will process and run a command line.
+
+  This will determine if the command line represents an internal shell
+  command or dispatch an external application.
+
+  @param[in] CmdLine      The command line to parse.
+  @param[out] CommandStatus   The status from the command line.
+
+  @retval EFI_SUCCESS     The command was completed.
+  @retval EFI_ABORTED     The command's operation was aborted.
+**/
+EFI_STATUS
+RunShellCommand(
+  IN CONST CHAR16   *CmdLine,
+  OUT EFI_STATUS    *CommandStatus
+  );
+
+/**
+  Function determines if the CommandName COULD be a valid command.  It does not determine whether
   this is a valid command.  It only checks for invalid characters.
 
@@ -305 +320 @@
 **/
 BOOLEAN
-EFIAPI
 IsValidCommandName(
   IN CONST CHAR16     *CommandName
@@ -316 +330 @@
   @param[in] Name               The name of the script file.
 
-  @retval EFI_SUCCESS           the script completed sucessfully
-**/
-EFI_STATUS
-EFIAPI
+  @retval EFI_SUCCESS           the script completed successfully
+**/
+EFI_STATUS
 RunScriptFileHandle (
   IN SHELL_FILE_HANDLE  Handle,
@@ -333 +346 @@
   @param[in] ParamProtocol      the shell parameters protocol pointer
 
-  @retval EFI_SUCCESS           the script completed sucessfully
-**/
-EFI_STATUS
-EFIAPI
+  @retval EFI_SUCCESS           the script completed successfully
+**/
+EFI_STATUS
 RunScriptFile (
   IN CONST CHAR16                   *ScriptPath,
@@ -345 +357 @@
 
 /**
-  Return the pointer to the first occurance of any character from a list of characters
+  Return the pointer to the first occurrence of any character from a list of characters.
 
   @param[in] String           the string to parse
@@ -355 +367 @@
 **/
 CONST CHAR16*
-EFIAPI
 FindFirstCharacter(
   IN CONST CHAR16 *String,
@@ -362 +373 @@
   );
 
+/**
+  Cleans off leading and trailing spaces and tabs.
+
+  @param[in] String pointer to the string to trim them off.
+**/
+EFI_STATUS
+TrimSpaces(
+  IN CHAR16 **String
+  );
+
+/**
+
+  Create a new buffer list and stores the old one to OldBufferList
+
+  @param OldBufferList   The temporary list head used to store the nodes in BufferToFreeList.
+**/
+VOID
+SaveBufferList (
+  OUT LIST_ENTRY     *OldBufferList
+  );
+
+/**
+  Restore previous nodes into BufferToFreeList .
+
+  @param OldBufferList   The temporary list head used to store the nodes in BufferToFreeList.
+**/
+VOID
+RestoreBufferList (
+  IN OUT LIST_ENTRY     *OldBufferList
+  );
+
+
+
 #endif //_SHELL_INTERNAL_HEADER_
 

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/Shell.inf

@@ -2 +2 @@
 #  This is the shell application
 #
-#  Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
-#  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+#  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
+#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -18 +18 @@
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = Shell
-  FILE_GUID                      = 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1
+  FILE_GUID                      = 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 # gUefiShellFileGuid
   MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
@@ -71 +71 @@
   SortLib
   HandleParsingLib
-  PathLib
+  UefiHiiServicesLib
 
 [Guids]
-  gShellVariableGuid                                      ## CONSUMES ## GUID
-  gShellMapGuid                                           ## CONSUMES ## GUID
-  gShellAliasGuid                                         ## CONSUMES ## GUID
+  gShellVariableGuid                                      ## SOMETIMES_CONSUMES ## GUID
+  gShellAliasGuid                                         ## SOMETIMES_CONSUMES ## GUID
+  gShellAliasGuid                                         ## SOMETIMES_PRODUCES ## GUID
 
 [Protocols]
@@ -90 +90 @@
   gEfiSimpleTextInProtocolGuid                            ## CONSUMES
   gEfiSimpleTextOutProtocolGuid                           ## CONSUMES
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES
   gEfiLoadedImageProtocolGuid                             ## CONSUMES
-  gEfiComponentName2ProtocolGuid                          ## CONSUMES
+  gEfiComponentName2ProtocolGuid                          ## SOMETIMES_CONSUMES
   gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES
   gEfiDevicePathProtocolGuid                              ## CONSUMES
+  gEfiHiiPackageListProtocolGuid                          ## SOMETIMES_PRODUCES
 
 [Pcd]
-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols  ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform   ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii  ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault     ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize    ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellInsertModeDefault    ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellScreenLogCount       ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength        ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole         ## CONSUMES
-  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier             ## CONSUMES
-
+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel           ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols    ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform     ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii    ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault       ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize      ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellInsertModeDefault      ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellScreenLogCount         ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength          ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize        ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole           ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier               ## CONSUMES
+  gEfiShellPkgTokenSpaceGuid.PcdShellMaxHistoryCommandCount ## CONSUMES

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/Shell.uni

@@ -1 @@
-// *++
+// *++
 //
-// Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
-// Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved. <BR>
+// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
+// Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved. <BR>
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
@@ -27 +27 @@
 #langdef   en-US "English"
 
-#string STR_SHELL_CURDIR              #language en-US "%E%s> %N"
-#string STR_GEN_PROBLEM               #language en-US "%EError. %NThe argument '%B%s%N' is incorrect.\r\n"
+#string STR_SHELL_CURDIR              #language en-US "%E%s\> %N"
+#string STR_GEN_PROBLEM               #language en-US "The argument '%B%s%N' is incorrect.\r\n"
 #string STR_SHELL_SHELL               #language en-US "%EShell> %N"
 
@@ -40 +40 @@
 #string STR_SHELL_CRLF                #language en-US "\r\n"
 
-#string STR_SHELL_ERROR               #language en-US  "%NError reported: %r\r\n"
+#string STR_SHELL_ERROR               #language en-US  "%NCommand Error Status: %r\r\n"
+#string STR_SHELL_ERROR_SCRIPT        #language en-US  "%NScript Error Status: %r (line number %d)\r\n"
 
-#string STR_SHELL_INVALID_MAPPING     #language en-US "%N'%B%s%N' is not a correct mapping.\r\n"
-#string STR_SHELL_INVALID_SPLIT       #language en-US "%EError.%N Invalid use of pipe (%B|%N).\r\n"
+#string STR_SHELL_INVALID_MAPPING     #language en-US "%N'%B%s%N' is not a valid mapping.\r\n"
+#string STR_SHELL_INVALID_SPLIT       #language en-US "Invalid use of pipe (%B|%N).\r\n"
 
-#string STR_SHELL_INVALID_REDIR       #language en-US "%EError.%N Unable to redirect file.\r\n"
-#string STR_SHELL_REDUNDA_REDIR       #language en-US "%EError.%N redundant redirection specified.\r\n"
+#string STR_SHELL_INVALID_REDIR       #language en-US "Unable to redirect file.\r\n"
+#string STR_SHELL_REDUNDA_REDIR       #language en-US "Redundant redirection specified.\r\n"
 
 #string STR_VER_OUTPUT_MAIN_SHELL     #language en-US "UEFI %s Shell v%d.%d\r\n"
@@ -52 +53 @@
 #string STR_VER_OUTPUT_MAIN_UEFI      #language en-US "UEFI v%d.%02d (%s, 0x%08x)\r\n"
 
-#string STR_SHELL_NO_IN_EX            #language en-US "%EError. Error.%N  No SimpleTextInputEx was found.  CTRL based features are not usable.\r\n"
+#string STR_SHELL_NO_IN_EX            #language en-US "No SimpleTextInputEx was found. CTRL-based features are not usable.\r\n"
+
+#string STR_SHELL_IMAGE_NOT_APP       #language en-US "The image is not an application.\r\n"
+

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

@@ -2 +2 @@
   function declarations for shell environment functions.
 
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -18 +18 @@
 #define INIT_DATA_BUFFER_SIZE  1024
 
+//
+// The list is used to cache the environment variables.
+//
+ENV_VAR_LIST                   gShellEnvVarList;
+
 /**
   Reports whether an environment variable is Volatile or Non-Volatile.
 
   @param EnvVarName             The name of the environment variable in question
-
-  @retval TRUE                  This environment variable is Volatile
-  @retval FALSE                 This environment variable is NON-Volatile
-**/
-BOOLEAN
-EFIAPI
+  @param Volatile               Return TRUE if the environment variable is volatile
+
+  @retval EFI_SUCCESS           The volatile attribute is returned successfully
+  @retval others                Some errors happened.
+**/
+EFI_STATUS
 IsVolatileEnv (
-  IN CONST CHAR16 *EnvVarName
+  IN CONST CHAR16 *EnvVarName,
+  OUT BOOLEAN     *Volatile
   )
 {
@@ -36 +42 @@
   VOID        *Buffer;
   UINT32      Attribs;
+
+  ASSERT (Volatile != NULL);
 
   Size = 0;
@@ -50 +58 @@
   if (Status == EFI_BUFFER_TOO_SMALL) {
     Buffer = AllocateZeroPool(Size);
-    ASSERT(Buffer != NULL);
+    if (Buffer == NULL) {
+      return EFI_OUT_OF_RESOURCES;
+    }
     Status = gRT->GetVariable((CHAR16*)EnvVarName,
                               &gShellVariableGuid,
@@ -62 +72 @@
   //
   if (Status == EFI_NOT_FOUND) {
-    return (TRUE);
-  }
-  ASSERT_EFI_ERROR(Status);
+    *Volatile = TRUE;
+    return EFI_SUCCESS;
+  }
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
 
   //
   // check for the Non Volatile bit
   //
-  if ((Attribs & EFI_VARIABLE_NON_VOLATILE) == EFI_VARIABLE_NON_VOLATILE) {
-    return (FALSE);
-  }
-
-  //
-  // everything else is volatile
-  //
-  return (TRUE);
+  *Volatile = !(BOOLEAN) ((Attribs & EFI_VARIABLE_NON_VOLATILE) == EFI_VARIABLE_NON_VOLATILE);
+  return EFI_SUCCESS;
 }
 
@@ -85 +92 @@
 **/
 VOID
-EFIAPI
 FreeEnvironmentVariableList(
   IN LIST_ENTRY *List
@@ -122 +128 @@
 **/
 EFI_STATUS
-EFIAPI
 GetEnvironmentVariableList(
   IN OUT LIST_ENTRY *ListHead
@@ -174 +179 @@
       } else {
         ValSize = ValBufferSize;
-        VarList->Val = AllocateZeroPool(ValSize);
+        //
+        // We need another CHAR16 to save '\0' in VarList->Val.
+        //
+        VarList->Val = AllocateZeroPool (ValSize + sizeof (CHAR16));
         if (VarList->Val == NULL) {
             SHELL_FREE_NON_NULL(VarList);
@@ -184 +192 @@
           ValBufferSize = ValSize > ValBufferSize * 2 ? ValSize : ValBufferSize * 2;
           SHELL_FREE_NON_NULL (VarList->Val);
-          VarList->Val = AllocateZeroPool(ValBufferSize);
+          //
+          // We need another CHAR16 to save '\0' in VarList->Val.
+          //
+          VarList->Val = AllocateZeroPool (ValBufferSize + sizeof (CHAR16));
           if (VarList->Val == NULL) {
             SHELL_FREE_NON_NULL(VarList);
@@ -232 +243 @@
 **/
 EFI_STATUS
-EFIAPI
 SetEnvironmentVariableList(
   IN LIST_ENTRY *ListHead
@@ -269 +279 @@
       ; Node = (ENV_VAR_LIST*)GetNextNode(ListHead, &Node->Link)
      ){
-    Size = StrSize(Node->Val);
+    Size = StrSize (Node->Val) - sizeof (CHAR16);
     if (Node->Atts & EFI_VARIABLE_NON_VOLATILE) {
       Status = SHELL_SET_ENVIRONMENT_VARIABLE_NV(Node->Key, Size, Node->Val);
@@ -296 +306 @@
 **/
 EFI_STATUS
-EFIAPI
 SetEnvironmentVariables(
   IN CONST CHAR16 **Environment
@@ -340 +349 @@
     // Copy the string into the Key, leaving the last character allocated as NULL to terminate
     //
-    StrnCpy(Node->Key, CurrentString, StrStr(CurrentString, L"=") - CurrentString);
+    StrnCpyS( Node->Key,
+              StrStr(CurrentString, L"=") - CurrentString + 1,
+              CurrentString,
+              StrStr(CurrentString, L"=") - CurrentString
+              );
 
     //
@@ -376 +389 @@
   return (SetEnvironmentVariableList(&VarList->Link));
 }
+
+/**
+  Find an environment variable in the gShellEnvVarList.
+
+  @param Key        The name of the environment variable.
+  @param Value      The value of the environment variable, the buffer
+                    shoule be freed by the caller.
+  @param ValueSize  The size in bytes of the environment variable
+                    including the tailing CHAR_NELL.
+  @param Atts       The attributes of the variable.
+
+  @retval EFI_SUCCESS       The command executed successfully.
+  @retval EFI_NOT_FOUND     The environment variable is not found in
+                            gShellEnvVarList.
+
+**/
+EFI_STATUS
+ShellFindEnvVarInList (
+  IN  CONST CHAR16    *Key,
+  OUT CHAR16          **Value,
+  OUT UINTN           *ValueSize,
+  OUT UINT32          *Atts OPTIONAL
+  )
+{
+  ENV_VAR_LIST      *Node;
+
+  if (Key == NULL || Value == NULL || ValueSize == NULL) {
+    return SHELL_INVALID_PARAMETER;
+  }
+
+  for ( Node = (ENV_VAR_LIST*)GetFirstNode(&gShellEnvVarList.Link)
+      ; !IsNull(&gShellEnvVarList.Link, &Node->Link)
+      ; Node = (ENV_VAR_LIST*)GetNextNode(&gShellEnvVarList.Link, &Node->Link)
+     ){
+    if (Node->Key != NULL && StrCmp(Key, Node->Key) == 0) {
+      *Value      = AllocateCopyPool(StrSize(Node->Val), Node->Val);
+      *ValueSize  = StrSize(Node->Val);
+      if (Atts != NULL) {
+        *Atts = Node->Atts;
+      }
+      return EFI_SUCCESS;
+    }
+  }
+
+  return EFI_NOT_FOUND;
+}
+
+/**
+  Add an environment variable into gShellEnvVarList.
+
+  @param Key        The name of the environment variable.
+  @param Value      The value of environment variable.
+  @param ValueSize  The size in bytes of the environment variable
+                    including the tailing CHAR_NULL
+  @param Atts       The attributes of the variable.
+
+  @retval EFI_SUCCESS  The environment variable was added to list successfully.
+  @retval others       Some errors happened.
+
+**/
+EFI_STATUS
+ShellAddEnvVarToList (
+  IN CONST CHAR16     *Key,
+  IN CONST CHAR16     *Value,
+  IN UINTN            ValueSize,
+  IN UINT32           Atts
+  )
+{
+  ENV_VAR_LIST      *Node;
+  CHAR16            *LocalKey;
+  CHAR16            *LocalValue;
+
+  if (Key == NULL || Value == NULL || ValueSize == 0) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  LocalValue = AllocateCopyPool (ValueSize, Value);
+  if (LocalValue == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  //
+  // Update the variable value if it exists in gShellEnvVarList.
+  //
+  for ( Node = (ENV_VAR_LIST*)GetFirstNode(&gShellEnvVarList.Link)
+      ; !IsNull(&gShellEnvVarList.Link, &Node->Link)
+      ; Node = (ENV_VAR_LIST*)GetNextNode(&gShellEnvVarList.Link, &Node->Link)
+     ){
+    if (Node->Key != NULL && StrCmp(Key, Node->Key) == 0) {
+      Node->Atts = Atts;
+      SHELL_FREE_NON_NULL(Node->Val);
+      Node->Val  = LocalValue;
+      return EFI_SUCCESS;
+    }
+  }
+
+  //
+  // If the environment varialbe key doesn't exist in list just insert
+  // a new node.
+  //
+  LocalKey = AllocateCopyPool (StrSize(Key), Key);
+  if (LocalKey == NULL) {
+    FreePool (LocalValue);
+    return EFI_OUT_OF_RESOURCES;
+  }
+  Node = (ENV_VAR_LIST*)AllocateZeroPool (sizeof(ENV_VAR_LIST));
+  if (Node == NULL) {
+    FreePool (LocalKey);
+    FreePool (LocalValue);
+    return EFI_OUT_OF_RESOURCES;
+  }
+  Node->Key = LocalKey;
+  Node->Val = LocalValue;
+  Node->Atts = Atts;
+  InsertTailList(&gShellEnvVarList.Link, &Node->Link);
+
+  return EFI_SUCCESS;
+}
+
+/**
+  Remove a specified environment variable in gShellEnvVarList.
+
+  @param Key        The name of the environment variable.
+
+  @retval EFI_SUCCESS       The command executed successfully.
+  @retval EFI_NOT_FOUND     The environment variable is not found in
+                            gShellEnvVarList.
+**/
+EFI_STATUS
+ShellRemvoeEnvVarFromList (
+  IN CONST CHAR16           *Key
+  )
+{
+  ENV_VAR_LIST      *Node;
+
+  if (Key == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  for ( Node = (ENV_VAR_LIST*)GetFirstNode(&gShellEnvVarList.Link)
+      ; !IsNull(&gShellEnvVarList.Link, &Node->Link)
+      ; Node = (ENV_VAR_LIST*)GetNextNode(&gShellEnvVarList.Link, &Node->Link)
+     ){
+    if (Node->Key != NULL && StrCmp(Key, Node->Key) == 0) {
+      SHELL_FREE_NON_NULL(Node->Key);
+      SHELL_FREE_NON_NULL(Node->Val);
+      RemoveEntryList(&Node->Link);
+      SHELL_FREE_NON_NULL(Node);
+      return EFI_SUCCESS;
+    }
+  }
+
+  return EFI_NOT_FOUND;
+}
+
+/**
+  Initialize the gShellEnvVarList and cache all Shell-Guid-based environment
+  variables.
+
+**/
+EFI_STATUS
+ShellInitEnvVarList (
+  VOID
+  )
+{
+  EFI_STATUS    Status;
+
+  InitializeListHead(&gShellEnvVarList.Link);
+  Status = GetEnvironmentVariableList (&gShellEnvVarList.Link);
+
+  return Status;
+}
+
+/**
+  Destructe the gShellEnvVarList.
+
+**/
+VOID
+ShellFreeEnvVarList (
+  VOID
+  )
+{
+  FreeEnvironmentVariableList (&gShellEnvVarList.Link);
+  InitializeListHead(&gShellEnvVarList.Link);
+
+  return;
+}
+

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ShellEnvVar.h

@@ -7 +7 @@
 
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -28 +28 @@
 } ENV_VAR_LIST;
 
-/**
-  Reports whether an environment variable is Volatile or Non-Volatile
-
-  This will use the Runtime Services call GetVariable to to search for the variable.
-
-  @param EnvVarName             The name of the environment variable in question
-
-  @retval TRUE                  This environment variable is Volatile
-  @retval FALSE                 This environment variable is NON-Volatile
-**/
-BOOLEAN
-EFIAPI
+//
+// The list is used to cache the environment variables.
+//
+extern ENV_VAR_LIST    gShellEnvVarList;
+
+
+/**
+  Reports whether an environment variable is Volatile or Non-Volatile.
+
+  @param EnvVarName             The name of the environment variable in question
+  @param Volatile               Return TRUE if the environment variable is volatile
+
+  @retval EFI_SUCCESS           The volatile attribute is returned successfully
+  @retval others                Some errors happened.
+**/
+EFI_STATUS
 IsVolatileEnv (
-  IN CONST CHAR16 *EnvVarName
+  IN CONST CHAR16 *EnvVarName,
+  OUT BOOLEAN     *Volatile
   );
 
@@ -152 +157 @@
 **/
 EFI_STATUS
-EFIAPI
 GetEnvironmentVariableList(
   IN OUT LIST_ENTRY *List
@@ -170 +174 @@
 **/
 EFI_STATUS
-EFIAPI
 SetEnvironmentVariableList(
   IN LIST_ENTRY *List
@@ -191 +194 @@
 **/
 EFI_STATUS
-EFIAPI
 SetEnvironmentVariables(
   IN CONST CHAR16 **Environment
@@ -202 +204 @@
 **/
 VOID
-EFIAPI
 FreeEnvironmentVariableList(
   IN LIST_ENTRY *List
   );
 
+/**
+  Find an environment variable in the gShellEnvVarList.
+
+  @param Key        The name of the environment variable.
+  @param Value      The value of the environment variable, the buffer
+                    shoule be freed by the caller.
+  @param ValueSize  The size in bytes of the environment variable
+                    including the tailing CHAR_NULL.
+  @param Atts       The attributes of the variable.
+
+  @retval EFI_SUCCESS       The command executed successfully.
+  @retval EFI_NOT_FOUND     The environment variable is not found in
+                            gShellEnvVarList.
+
+**/
+EFI_STATUS
+ShellFindEnvVarInList (
+  IN  CONST CHAR16    *Key,
+  OUT CHAR16          **Value,
+  OUT UINTN           *ValueSize,
+  OUT UINT32          *Atts OPTIONAL
+  );
+
+/**
+  Add an environment variable into gShellEnvVarList.
+
+  @param Key        The name of the environment variable.
+  @param Value      The value of environment variable.
+  @param ValueSize  The size in bytes of the environment variable
+                    including the tailing CHAR_NULL
+  @param Atts       The attributes of the variable.
+
+  @retval EFI_SUCCESS  The environment variable was added to list successfully.
+  @retval others       Some errors happened.
+
+**/
+EFI_STATUS
+ShellAddEnvVarToList (
+  IN CONST CHAR16     *Key,
+  IN CONST CHAR16     *Value,
+  IN UINTN            ValueSize,
+  IN UINT32           Atts
+  );
+
+/**
+  Remove a specified environment variable in gShellEnvVarList.
+
+  @param Key        The name of the environment variable.
+
+  @retval EFI_SUCCESS       The command executed successfully.
+  @retval EFI_NOT_FOUND     The environment variable is not found in
+                            gShellEnvVarList.
+**/
+EFI_STATUS
+ShellRemvoeEnvVarFromList (
+  IN CONST CHAR16           *Key
+  );
+
+/**
+  Initialize the gShellEnvVarList and cache all Shell-Guid-based environment
+  variables.
+
+**/
+EFI_STATUS
+ShellInitEnvVarList (
+  VOID
+  );
+
+/**
+  Destructe the gShellEnvVarList.
+
+**/
+VOID
+ShellFreeEnvVarList (
+  VOID
+  );
+
 #endif //_SHELL_ENVIRONMENT_VARIABLE_HEADER_
 

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ShellManParser.c

@@ -2 +2 @@
   Provides interface to shell MAN file parser.
 
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright 2015 Dell Inc.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -15 +16 @@
 #include "Shell.h"
 
+#define SHELL_MAN_HII_GUID \
+{ \
+  0xf62ccd0c, 0x2449, 0x453c, { 0x8a, 0xcb, 0x8c, 0xc5, 0x7c, 0xf0, 0x2a, 0x97 } \
+}
+
+EFI_HII_HANDLE  mShellManHiiHandle    = NULL;
+EFI_HANDLE      mShellManDriverHandle = NULL;
+
+
+SHELL_MAN_HII_VENDOR_DEVICE_PATH  mShellManHiiDevicePath = {
+  {
+    {
+      HARDWARE_DEVICE_PATH,
+      HW_VENDOR_DP,
+      {
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
+      }
+    },
+    SHELL_MAN_HII_GUID
+  },
+  {
+    END_DEVICE_PATH_TYPE,
+    END_ENTIRE_DEVICE_PATH_SUBTYPE,
+    {
+      (UINT8) (END_DEVICE_PATH_LENGTH),
+      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
+    }
+  }
+};
+
+
+/**
+  Convert a Unicode character to upper case only if
+  it maps to a valid small-case ASCII character.
+
+  This internal function only deal with Unicode character
+  which maps to a valid small-case ASCII character, i.e.
+  L'a' to L'z'. For other Unicode character, the input character
+  is returned directly.
+
+  @param  Char  The character to convert.
+
+  @retval LowerCharacter   If the Char is with range L'a' to L'z'.
+  @retval Unchanged        Otherwise.
+
+**/
+CHAR16
+InternalShellCharToUpper (
+  IN CHAR16  Char
+  );
+
+/**
+  Verifies that the filename has .EFI on the end.
+
+  allocates a new buffer and copies the name (appending .EFI if necessary).
+  Caller to free the buffer.
+
+  @param[in] NameString            original name string
+
+  @return                          the new filename with .efi as the extension.
+**/
+CHAR16 *
+GetExecuatableFileName (
+  IN CONST CHAR16    *NameString
+  )
+{
+  CHAR16  *Buffer;
+  CHAR16  *SuffixStr;
+  if (NameString == NULL) {
+    return (NULL);
+  }
+
+  //
+  // Fix the file name
+  //
+  if (StrnCmp(NameString+StrLen(NameString)-StrLen(L".efi"), L".efi", StrLen(L".efi"))==0) {
+    Buffer = AllocateCopyPool(StrSize(NameString), NameString);
+  } else if (StrnCmp(NameString+StrLen(NameString)-StrLen(L".man"), L".man", StrLen(L".man"))==0) {
+    Buffer = AllocateCopyPool(StrSize(NameString), NameString);
+    if (Buffer != NULL) {
+      SuffixStr = Buffer+StrLen(Buffer)-StrLen(L".man");
+      StrnCpyS (SuffixStr, StrSize(L".man")/sizeof(CHAR16), L".efi", StrLen(L".efi"));
+    }
+  } else {
+    Buffer = AllocateZeroPool(StrSize(NameString) + StrLen(L".efi")*sizeof(CHAR16));
+    if (Buffer != NULL) {
+      StrnCpyS( Buffer,
+                (StrSize(NameString) + StrLen(L".efi")*sizeof(CHAR16))/sizeof(CHAR16),
+                NameString,
+                StrLen(NameString)
+                );
+      StrnCatS( Buffer,
+                (StrSize(NameString) + StrLen(L".efi")*sizeof(CHAR16))/sizeof(CHAR16),
+                L".efi",
+                StrLen(L".efi")
+                );
+    }
+  }
+  return (Buffer);
+
+}
+
 /**
   Verifies that the filename has .MAN on the end.
@@ -27 +131 @@
 **/
 CHAR16 *
-EFIAPI
 GetManFileName(
   IN CONST CHAR16 *ManFileName
@@ -44 +147 @@
     Buffer = AllocateZeroPool(StrSize(ManFileName) + 4*sizeof(CHAR16));
     if (Buffer != NULL) {
-      StrnCpy(Buffer, ManFileName, StrLen(ManFileName));
-      StrnCat(Buffer, L".man", 4);
+      StrnCpyS( Buffer,
+                (StrSize(ManFileName) + 4*sizeof(CHAR16))/sizeof(CHAR16),
+                ManFileName,
+                StrLen(ManFileName)
+                );
+      StrnCatS( Buffer,
+                (StrSize(ManFileName) + 4*sizeof(CHAR16))/sizeof(CHAR16),
+                L".man",
+                4
+                );
     }
   }
@@ -66 +177 @@
 **/
 EFI_STATUS
-EFIAPI
 SearchPathForFile(
   IN CONST CHAR16             *FileName,
@@ -97 +207 @@
 
 /**
-  parses through Buffer (which is MAN file formatted) and returns the
-  detailed help for any sub section specified in the comma seperated list of
-  sections provided.  If the end of the file or a .TH section is found then
-  return.
-
-  Upon a sucessful return the caller is responsible to free the memory in *HelpText
-
-  @param[in] Buffer             Buffer to read from
-  @param[in] Sections           name of command's sub sections to find
-  @param[in] HelpText           pointer to pointer to string where text goes.
-  @param[in] HelpSize           pointer to size of allocated HelpText (may be updated)
-
-  @retval EFI_OUT_OF_RESOURCES  a memory allocation failed.
-  @retval EFI_SUCCESS           the section was found and its description sotred in
-                                an alloceted buffer.
-**/
-EFI_STATUS
-EFIAPI
-ManBufferFindSections(
-  IN CONST CHAR16 *Buffer,
-  IN CONST CHAR16 *Sections,
-  IN CHAR16       **HelpText,
-  IN UINTN        *HelpSize
-  )
-{
-  EFI_STATUS          Status;
-  CONST CHAR16        *CurrentLocation;
-  BOOLEAN             CurrentlyReading;
-  CHAR16              *SectionName;
-  UINTN               SectionLen;
-  BOOLEAN             Found;
-  CHAR16              *TempString;
-  CHAR16              *TempString2;
-
-  if ( Buffer     == NULL
-    || HelpText   == NULL
-    || HelpSize   == NULL
-   ){
-    return (EFI_INVALID_PARAMETER);
-  }
-
-  Status            = EFI_SUCCESS;
-  CurrentlyReading  = FALSE;
-  Found             = FALSE;
-
-  for (CurrentLocation = Buffer,TempString = NULL
-    ;  CurrentLocation != NULL && *CurrentLocation != CHAR_NULL
-    ;  CurrentLocation=StrStr(CurrentLocation, L"\r\n"),TempString = NULL
-   ){
-    while(CurrentLocation[0] == L'\r' || CurrentLocation[0] == L'\n') {
-      CurrentLocation++;
-    }
-    if (CurrentLocation[0] == L'#') {
-      //
-      // Skip comment lines
-      //
-      continue;
-    }
-    if (StrnCmp(CurrentLocation, L".TH", 3) == 0) {
-      //
-      // we hit the end of this commands section so stop.
-      //
-      break;
-    }
-    if (StrnCmp(CurrentLocation, L".SH ", 4) == 0) {
-      if (Sections == NULL) {
-        CurrentlyReading = TRUE;
-        continue;
-      } else if (CurrentlyReading) {
-        CurrentlyReading = FALSE;
-      }
-      CurrentLocation += 4;
-      //
-      // is this a section we want to read in?
-      //
-      if (StrLen(CurrentLocation)!=0) {
-        TempString2 = StrStr(CurrentLocation, L" ");
-        TempString2 = MIN(TempString2, StrStr(CurrentLocation, L"\r"));
-        TempString2 = MIN(TempString2, StrStr(CurrentLocation, L"\n"));
-        ASSERT(TempString == NULL);
-        TempString = StrnCatGrow(&TempString, NULL, CurrentLocation, TempString2==NULL?0:TempString2 - CurrentLocation);
-        if (TempString == NULL) {
-          Status = EFI_OUT_OF_RESOURCES;
-          break;
-        }
-        SectionName = TempString;
-        SectionLen = StrLen(SectionName);
-        SectionName = StrStr(Sections, SectionName);
-        if (SectionName == NULL) {
-          continue;
-        }
-        if (*(SectionName + SectionLen) == CHAR_NULL || *(SectionName + SectionLen) == L',') {
-          CurrentlyReading = TRUE;
-        }
-      }
-    } else if (CurrentlyReading) {
-      Found = TRUE;
-      if (StrLen(CurrentLocation)!=0) {
-        TempString2 = StrStr(CurrentLocation, L"\r");
-        TempString2 = MIN(TempString2, StrStr(CurrentLocation, L"\n"));
-        ASSERT(TempString == NULL);
-        TempString = StrnCatGrow(&TempString, NULL, CurrentLocation, TempString2==NULL?0:TempString2 - CurrentLocation);
-        if (TempString == NULL) {
-          Status = EFI_OUT_OF_RESOURCES;
-          break;
-        }
-        //
-        // copy and save the current line.
-        //
-        ASSERT((*HelpText == NULL && *HelpSize == 0) || (*HelpText != NULL));
-        StrnCatGrow (HelpText, HelpSize, TempString, 0);
-        if (HelpText == NULL) {
-          Status = EFI_OUT_OF_RESOURCES;
-          break;
-        }
-        StrnCatGrow (HelpText, HelpSize, L"\r\n", 0);
-        if (HelpText == NULL) {
-          Status = EFI_OUT_OF_RESOURCES;
-          break;
-        }
-      }
-    }
-    SHELL_FREE_NON_NULL(TempString);
-  }
-  if (!Found && !EFI_ERROR(Status)) {
-    return (EFI_NOT_FOUND);
-  }
-  return (Status);
-}
-
-/**
   parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
   detailed help for any sub section specified in the comma seperated list of
@@ -246 +225 @@
 **/
 EFI_STATUS
-EFIAPI
 ManFileFindSections(
   IN SHELL_FILE_HANDLE  Handle,
@@ -344 +322 @@
 
 /**
-  parses through the MAN file formatted Buffer and returns the
+  Parses a line from a MAN file to see if it is the Title Header. If it is, then
+  if the "Brief Description" is desired, allocate a buffer for it and return a
+  copy. Upon a sucessful return the caller is responsible to free the memory in
+  *BriefDesc
+
+  Uses a simple state machine that allows "unlimited" whitespace before and after the
+  ".TH", compares Command and the MAN file commnd name without respect to case, and
+  allows "unlimited" whitespace and '0' and '1' characters before the Short Description.
+  The PCRE regex describing this functionality is: ^\s*\.TH\s+(\S)\s[\s01]*(.*)$
+  where group 1 is the Command Name and group 2 is the Short Description.
+
+  @param[in] Command             name of command whose MAN file we think Line came from
+  @param[in] Line                Pointer to a line from the MAN file
+  @param[out] BriefDesc          pointer to pointer to string where description goes.
+  @param[out] BriefSize          pointer to size of allocated BriefDesc
+  @param[out] Found              TRUE if the Title Header was found and it belongs to Command
+
+  @retval TRUE   Line contained the Title Header
+  @retval FALSE  Line did not contain the Title Header
+**/
+BOOLEAN
+IsTitleHeader(
+  IN CONST CHAR16       *Command,
+  IN CHAR16             *Line,
+  OUT CHAR16            **BriefDesc OPTIONAL,
+  OUT UINTN             *BriefSize OPTIONAL,
+  OUT BOOLEAN           *Found
+  )
+{
+  // The states of a simple state machine used to recognize a title header line
+  // and to extract the Short Description, if desired.
+  typedef enum {
+    LookForThMacro, LookForCommandName, CompareCommands, GetBriefDescription, Final
+  } STATEVALUES;
+
+  STATEVALUES  State;
+  UINTN        CommandIndex; // Indexes Command as we compare its chars to the MAN file.
+  BOOLEAN      ReturnValue;  // TRUE if this the Title Header line of *some* MAN file.
+  BOOLEAN      ReturnFound;  // TRUE if this the Title Header line of *the desired* MAN file.
+
+  ReturnValue = FALSE;
+  ReturnFound = FALSE;
+  CommandIndex = 0;
+  State = LookForThMacro;
+
+  do {
+
+    if (*Line == L'\0') {
+      break;
+    }
+
+    switch (State) {
+
+      // Handle "^\s*.TH\s"
+      // Go to state LookForCommandName if the title header macro is present; otherwise,
+      // eat white space. If we see something other than white space, this is not a
+      // title header line.
+      case LookForThMacro:
+        if (StrnCmp (L".TH ", Line, 4) == 0 || StrnCmp (L".TH\t", Line, 4) == 0) {
+          Line += 4;
+          State = LookForCommandName;
+        }
+        else if (*Line == L' ' || *Line == L'\t') {
+          Line++;
+        }
+        else {
+          State = Final;
+        }
+      break;
+
+      // Handle "\s*"
+      // Eat any "extra" whitespace after the title header macro (we have already seen
+      // at least one white space character). Go to state CompareCommands when a
+      // non-white space is seen.
+      case LookForCommandName:
+        if (*Line == L' ' || *Line == L'\t') {
+          Line++;
+        }
+        else {
+          ReturnValue = TRUE;  // This is *some* command's title header line.
+          State = CompareCommands;
+          // Do not increment Line; it points to the first character of the command
+          // name on the title header line.
+        }
+      break;
+
+      // Handle "(\S)\s"
+      // Compare Command to the title header command name, ignoring case. When we
+      // reach the end of the command (i.e. we see white space), the next state
+      // depends on whether the caller wants a copy of the Brief Description.
+      case CompareCommands:
+        if (*Line == L' ' || *Line == L'\t') {
+          ReturnFound = TRUE;  // This is the desired command's title header line.
+          State = (BriefDesc == NULL) ? Final : GetBriefDescription;
+        }
+        else if (InternalShellCharToUpper (*Line) != InternalShellCharToUpper (*(Command + CommandIndex++))) {
+          State = Final;
+        }
+        Line++;
+      break;
+
+      // Handle "[\s01]*(.*)$"
+      // Skip whitespace, '0', and '1' characters, if any, prior to the brief description.
+      // Return the description to the caller.
+      case GetBriefDescription:
+        if (*Line != L' ' && *Line != L'\t' && *Line != L'0' && *Line != L'1') {
+          *BriefSize = StrSize(Line);
+          *BriefDesc = AllocateZeroPool(*BriefSize);
+          if (*BriefDesc != NULL) {
+            StrCpyS(*BriefDesc, (*BriefSize)/sizeof(CHAR16), Line);
+          }
+          State = Final;
+        }
+        Line++;
+      break;
+
+      default:
+       break;
+    }
+
+  } while (State < Final);
+
+  *Found = ReturnFound;
+  return ReturnValue;
+}
+
+/**
+  parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
   "Brief Description" for the .TH section as specified by Command.  If the
   command section is not found return EFI_NOT_FOUND.
@@ -350 +455 @@
   Upon a sucessful return the caller is responsible to free the memory in *BriefDesc
 
-  @param[in] Handle             Buffer to read from
-  @param[in] Command            name of command's section to find
-  @param[in] BriefDesc          pointer to pointer to string where description goes.
-  @param[in] BriefSize          pointer to size of allocated BriefDesc
-
-  @retval EFI_OUT_OF_RESOURCES  a memory allocation failed.
-  @retval EFI_SUCCESS           the section was found and its description sotred in
-                                an alloceted buffer.
-**/
-EFI_STATUS
-EFIAPI
-ManBufferFindTitleSection(
-  IN CHAR16         **Buffer,
-  IN CONST CHAR16   *Command,
-  IN CHAR16         **BriefDesc,
-  IN UINTN          *BriefSize
-  )
-{
-  EFI_STATUS    Status;
-  CHAR16        *TitleString;
-  CHAR16        *TitleEnd;
-  CHAR16        *CurrentLocation;
-  UINTN         TitleLength;
-  CONST CHAR16  StartString[] = L".TH ";
-  CONST CHAR16  EndString[]   = L" 0 ";
-
-  if ( Buffer     == NULL
-    || Command    == NULL
-    || (BriefDesc != NULL && BriefSize == NULL)
-   ){
-    return (EFI_INVALID_PARAMETER);
-  }
-
-  Status    = EFI_SUCCESS;
-
-  //
-  // more characters for StartString and EndString
-  //
-  TitleLength = StrSize(Command) + (StrLen(StartString) + StrLen(EndString)) * sizeof(CHAR16);
-  TitleString = AllocateZeroPool(TitleLength);
-  if (TitleString == NULL) {
-    return (EFI_OUT_OF_RESOURCES);
-  }
-  StrnCpy(TitleString, StartString, TitleLength/sizeof(CHAR16) - 1);
-  StrnCat(TitleString, Command,     TitleLength/sizeof(CHAR16) - 1 - StrLen(TitleString));
-  StrnCat(TitleString, EndString,   TitleLength/sizeof(CHAR16) - 1 - StrLen(TitleString));
-
-  CurrentLocation = StrStr(*Buffer, TitleString);
-  if (CurrentLocation == NULL){
-    Status = EFI_NOT_FOUND;
-  } else {
-    //
-    // we found it so copy out the rest of the line into BriefDesc
-    // After skipping any spaces or zeroes
-    //
-    for (CurrentLocation += StrLen(TitleString)
-      ;  *CurrentLocation == L' ' || *CurrentLocation == L'0' || *CurrentLocation == L'1' || *CurrentLocation == L'\"'
-      ;  CurrentLocation++);
-
-    TitleEnd = StrStr(CurrentLocation, L"\"");
-    if (TitleEnd == NULL) {
-      Status = EFI_DEVICE_ERROR;
-    } else {
-      if (BriefDesc != NULL) {
-        *BriefSize = StrSize(TitleEnd);
-        *BriefDesc = AllocateZeroPool(*BriefSize);
-        if (*BriefDesc == NULL) {
-          Status = EFI_OUT_OF_RESOURCES;
-        } else {
-          StrnCpy(*BriefDesc, CurrentLocation, TitleEnd-CurrentLocation);
-        }
-      }
-
-      for (CurrentLocation = TitleEnd
-        ;  *CurrentLocation != L'\n'
-        ;  CurrentLocation++);
-      for (
-        ;  *CurrentLocation == L' ' || *CurrentLocation == L'\n' || *CurrentLocation == L'\r'
-        ;  CurrentLocation++);
-      *Buffer = CurrentLocation;
-    }
-  }
-
-  FreePool(TitleString);
-  return (Status);
-}
-
-/**
-  parses through the MAN file specified by SHELL_FILE_HANDLE and returns the
-  "Brief Description" for the .TH section as specified by Command.  if the
-  command section is not found return EFI_NOT_FOUND.
-
-  Upon a sucessful return the caller is responsible to free the memory in *BriefDesc
-
   @param[in] Handle              FileHandle to read from
-  @param[in] Command             name of command's section to find
+  @param[in] Command             name of command's section to find as entered on the
+                                 command line (may be a relative or absolute path or
+                                 be in any case: upper, lower, or mixed in numerous ways!).
   @param[out] BriefDesc          pointer to pointer to string where description goes.
   @param[out] BriefSize          pointer to size of allocated BriefDesc
@@ -452 +465 @@
 
   @retval EFI_OUT_OF_RESOURCES  a memory allocation failed.
-  @retval EFI_SUCCESS           the section was found and its description sotred in
-                                an alloceted buffer.
+  @retval EFI_SUCCESS           the section was found and its description stored in
+                                an allocated buffer if requested.
 **/
 EFI_STATUS
-EFIAPI
 ManFileFindTitleSection(
   IN SHELL_FILE_HANDLE  Handle,
@@ -466 +478 @@
 {
   EFI_STATUS  Status;
-  CHAR16      *TitleString;
   CHAR16      *ReadLine;
   UINTN       Size;
-  CHAR16      *TitleEnd;
-  UINTN       TitleLen;
   BOOLEAN     Found;
-  UINTN       TitleSize;
+  UINTN       Start;
 
   if ( Handle     == NULL
@@ -490 +499 @@
   }
 
-  TitleSize = (4*sizeof(CHAR16)) + StrSize(Command);
-  TitleString = AllocateZeroPool(TitleSize);
-  if (TitleString == NULL) {
-    FreePool(ReadLine);
-    return (EFI_OUT_OF_RESOURCES);
-  }
-  StrnCpy(TitleString, L".TH ", TitleSize/sizeof(CHAR16) - 1);
-  StrnCat(TitleString, Command, TitleSize/sizeof(CHAR16) - 1 - StrLen(TitleString));
-
-  TitleLen = StrLen(TitleString);
+  //
+  // Do not pass any leading path information that may be present to IsTitleHeader().
+  //
+  Start = StrLen(Command);
+  while ((Start != 0)
+         && (*(Command + Start - 1) != L'\\')
+         && (*(Command + Start - 1) != L'/')
+         && (*(Command + Start - 1) != L':')) {
+    --Start;
+  }
+
   for (;!ShellFileHandleEof(Handle);Size = 1024) {
    Status = ShellFileHandleReadLine(Handle, ReadLine, &Size, TRUE, Ascii);
-    if (ReadLine[0] == L'#') {
-      //
-      // Skip comment lines
-      //
-      continue;
-    }
     //
     // ignore too small of buffer...
     //
-    if (Status == EFI_BUFFER_TOO_SMALL) {
-      Status = EFI_SUCCESS;
-    }
-    if (EFI_ERROR(Status)) {
-      break;
-    }
-    if (StrnCmp(ReadLine, TitleString, TitleLen) == 0) {
-      Found = TRUE;
-      //
-      // we found it so copy out the rest of the line into BriefDesc
-      // After skipping any spaces or zeroes
-      //
-      for ( TitleEnd = ReadLine+TitleLen
-          ; *TitleEnd == L' ' || *TitleEnd == L'0' || *TitleEnd == L'1'
-          ; TitleEnd++);
-      if (BriefDesc != NULL) {
-        *BriefSize = StrSize(TitleEnd);
-        *BriefDesc = AllocateZeroPool(*BriefSize);
-        if (*BriefDesc == NULL) {
-          Status = EFI_OUT_OF_RESOURCES;
-          break;
-        }
-        StrnCpy(*BriefDesc, TitleEnd, (*BriefSize)/sizeof(CHAR16) - 1);
-      }
-      break;
-    }
-  }
+    if (EFI_ERROR(Status) && Status != EFI_BUFFER_TOO_SMALL) {
+      break;
+    }
+
+    Status = EFI_NOT_FOUND;
+    if (IsTitleHeader (Command+Start, ReadLine, BriefDesc, BriefSize, &Found)) {
+      Status = Found ? EFI_SUCCESS : EFI_NOT_FOUND;
+      break;
+    }
+  }
+
   FreePool(ReadLine);
-  FreePool(TitleString);
-  if (!Found && !EFI_ERROR(Status)) {
-    return (EFI_NOT_FOUND);
-  }
   return (Status);
 }
@@ -577 +561 @@
 **/
 EFI_STATUS
-EFIAPI
 ProcessManFile(
   IN CONST CHAR16 *ManFileName,
@@ -588 +571 @@
   CHAR16            *TempString;
   SHELL_FILE_HANDLE FileHandle;
+  EFI_HANDLE        CmdFileImgHandle;
   EFI_STATUS        Status;
   UINTN             HelpSize;
   UINTN             BriefSize;
+  UINTN             StringIdWalker;
   BOOLEAN           Ascii;
-  CHAR16            *TempString2;
-  EFI_DEVICE_PATH_PROTOCOL  *FileDevPath;
-  EFI_DEVICE_PATH_PROTOCOL  *DevPath;
+  CHAR16            *CmdFileName;
+  CHAR16            *CmdFilePathName;
+  EFI_DEVICE_PATH_PROTOCOL      *FileDevPath;
+  EFI_DEVICE_PATH_PROTOCOL      *DevPath;
+  EFI_HII_PACKAGE_LIST_HEADER   *PackageListHeader;
 
   if ( ManFileName == NULL
@@ -603 +590 @@
   }
 
-  HelpSize    = 0;
-  BriefSize   = 0;
-  TempString  = NULL;
-  Ascii       = FALSE;
+  HelpSize          = 0;
+  BriefSize         = 0;
+  StringIdWalker    = 0;
+  TempString        = NULL;
+  Ascii             = FALSE;
+  CmdFileName       = NULL;
+  CmdFilePathName   = NULL;
+  CmdFileImgHandle  = NULL;
+  PackageListHeader = NULL;
+  FileDevPath       = NULL;
+  DevPath           = NULL;
+
   //
   // See if it's in HII first
@@ -612 +607 @@
   TempString = ShellCommandGetCommandHelp(Command);
   if (TempString != NULL) {
-    TempString2 = TempString;
-    Status = ManBufferFindTitleSection(&TempString2, Command, BriefDesc, &BriefSize);
+    FileHandle = ConvertEfiFileProtocolToShellHandle (CreateFileInterfaceMem (TRUE), NULL);
+    HelpSize = StrLen (TempString) * sizeof (CHAR16);
+    ShellWriteFile (FileHandle, &HelpSize, TempString);
+    ShellSetFilePosition (FileHandle, 0);
+    HelpSize  = 0;
+    BriefSize = 0;
+    Status = ManFileFindTitleSection(FileHandle, Command, BriefDesc, &BriefSize, &Ascii);
     if (!EFI_ERROR(Status) && HelpText != NULL){
-      Status = ManBufferFindSections(TempString2, Sections, HelpText, &HelpSize);
-    }
+      Status = ManFileFindSections(FileHandle, Sections, HelpText, &HelpSize, Ascii);
+    }
+    ShellCloseFile (&FileHandle);
   } else {
+    //
+    // If the image is a external app, check .MAN file first.
+    //
     FileHandle    = NULL;
     TempString  = GetManFileName(ManFileName);
@@ -629 +633 @@
       DevPath = AppendDevicePath (ShellInfoObject.ImageDevPath, FileDevPath);
       Status = InternalOpenFileDevicePath(DevPath, &FileHandle, EFI_FILE_MODE_READ, 0);
-      FreePool(FileDevPath);
-      FreePool(DevPath);
+      SHELL_FREE_NON_NULL(FileDevPath);
+      SHELL_FREE_NON_NULL(DevPath);
     }
 
@@ -641 +645 @@
       }
       ShellInfoObject.NewEfiShellProtocol->CloseFile(FileHandle);
-    } else {
+      if (!EFI_ERROR(Status)) {
+        //
+        // Get help text from .MAN file success.
+        //
+        goto Done;
+      }
+    }
+
+    //
+    // Load the app image to check  EFI_HII_PACKAGE_LIST_PROTOCOL.
+    //
+    CmdFileName     = GetExecuatableFileName(TempString);
+    if (CmdFileName == NULL) {
+      Status = EFI_OUT_OF_RESOURCES;
+      goto Done;
+    }
+    //
+    // If the file in CWD then use the file name, else use the full
+    // path name.
+    //
+    CmdFilePathName = ShellFindFilePath(CmdFileName);
+    if (CmdFilePathName == NULL) {
+      Status = EFI_NOT_FOUND;
+      goto Done;
+    }
+    DevPath = ShellInfoObject.NewEfiShellProtocol->GetDevicePathFromFilePath(CmdFilePathName);
+    Status      = gBS->LoadImage(FALSE, gImageHandle, DevPath, NULL, 0, &CmdFileImgHandle);
+    if(EFI_ERROR(Status)) {
       *HelpText = NULL;
-    }
-  }
-  if (TempString != NULL) {
-    FreePool(TempString);
-  }
+      goto Done;
+    }
+    Status = gBS->OpenProtocol(
+                    CmdFileImgHandle,
+                    &gEfiHiiPackageListProtocolGuid,
+                    (VOID**)&PackageListHeader,
+                    gImageHandle,
+                    NULL,
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                    );
+    if(EFI_ERROR(Status)) {
+      *HelpText = NULL;
+      goto Done;
+    }
+
+    //
+    // If get package list on image handle, install it on HiiDatabase.
+    //
+    Status = gBS->InstallProtocolInterface (
+                    &mShellManDriverHandle,
+                    &gEfiDevicePathProtocolGuid,
+                    EFI_NATIVE_INTERFACE,
+                    &mShellManHiiDevicePath
+                    );
+    if (EFI_ERROR(Status)) {
+      goto Done;
+    }
+
+    Status = gHiiDatabase->NewPackageList (
+                            gHiiDatabase,
+                            PackageListHeader,
+                            mShellManDriverHandle,
+                            &mShellManHiiHandle
+                            );
+    if (EFI_ERROR (Status)) {
+      goto Done;
+    }
+
+    StringIdWalker = 1;
+    do {
+        SHELL_FREE_NON_NULL(TempString);
+        if (BriefDesc != NULL) {
+          SHELL_FREE_NON_NULL(*BriefDesc);
+        }
+        TempString = HiiGetString (mShellManHiiHandle, (EFI_STRING_ID)StringIdWalker, NULL);
+        if (TempString == NULL) {
+          Status = EFI_NOT_FOUND;
+          goto Done;
+        }
+        FileHandle = ConvertEfiFileProtocolToShellHandle (CreateFileInterfaceMem (TRUE), NULL);
+        HelpSize = StrLen (TempString) * sizeof (CHAR16);
+        ShellWriteFile (FileHandle, &HelpSize, TempString);
+        ShellSetFilePosition (FileHandle, 0);
+        HelpSize  = 0;
+        BriefSize = 0;
+        Status = ManFileFindTitleSection(FileHandle, Command, BriefDesc, &BriefSize, &Ascii);
+        if (!EFI_ERROR(Status) && HelpText != NULL){
+          Status = ManFileFindSections(FileHandle, Sections, HelpText, &HelpSize, Ascii);
+        }
+        ShellCloseFile (&FileHandle);
+        if (!EFI_ERROR(Status)){
+          //
+          // Found what we need and return
+          //
+          goto Done;
+        }
+
+        StringIdWalker += 1;
+    } while (StringIdWalker < 0xFFFF && TempString != NULL);
+
+  }
+
+Done:
+  if (mShellManDriverHandle != NULL) {
+    gBS->UninstallProtocolInterface (
+            mShellManDriverHandle,
+            &gEfiDevicePathProtocolGuid,
+            &mShellManHiiDevicePath
+           );
+    mShellManDriverHandle = NULL;
+  }
+
+  if (mShellManHiiHandle != NULL) {
+    HiiRemovePackages (mShellManHiiHandle);
+    mShellManHiiHandle = NULL;
+  }
+
+  if (CmdFileImgHandle != NULL) {
+    Status = gBS->UnloadImage (CmdFileImgHandle);
+  }
+
+  SHELL_FREE_NON_NULL(TempString);
+  SHELL_FREE_NON_NULL(CmdFileName);
+  SHELL_FREE_NON_NULL(CmdFilePathName);
+  SHELL_FREE_NON_NULL(FileDevPath);
+  SHELL_FREE_NON_NULL(DevPath);
 
   return (Status);
 }
+

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ShellManParser.h

@@ -46 +46 @@
 **/
 EFI_STATUS
-EFIAPI
 ProcessManFile(
   IN CONST CHAR16 *ManFileName,
@@ -74 +73 @@
 **/
 EFI_STATUS
-EFIAPI
 ManFileFindSections(
   IN SHELL_FILE_HANDLE  Handle,

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

@@ -3 +3 @@
   manipulation, and initialization of EFI_SHELL_PARAMETERS_PROTOCOL.
 
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
   Copyright (C) 2014, Red Hat, Inc.
-  Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -18 +19 @@
 #include "Shell.h"
 
+BOOLEAN AsciiRedirection = FALSE;
+
 /**
   Return the next parameter's end from a command line string.
@@ -24 +27 @@
 **/
 CONST CHAR16*
-EFIAPI
 FindEndOfParameter(
   IN CONST CHAR16 *String
@@ -73 +75 @@
   This will also remove all remaining ^ characters after processing.
 
-  @param[in, out] Walker        pointer to string of command line.  Adjusted to
-                                reminaing command line on return
-  @param[in, out] TempParameter pointer to string of command line item extracted.
-  @param[in]      Length        buffer size of TempParameter.
+  @param[in, out] Walker          pointer to string of command line.  Adjusted to
+                                  reminaing command line on return
+  @param[in, out] TempParameter   pointer to string of command line item extracted.
+  @param[in]      Length          buffer size of TempParameter.
+  @param[in]      StripQuotation  if TRUE then strip the quotation marks surrounding
+                                  the parameters.
 
   @return   EFI_INALID_PARAMETER  A required parameter was NULL or pointed to a NULL or empty string.
@@ -82 +86 @@
 **/
 EFI_STATUS
-EFIAPI
 GetNextParameter(
   IN OUT CHAR16   **Walker,
   IN OUT CHAR16   **TempParameter,
-  IN CONST UINTN  Length
+  IN CONST UINTN  Length,
+  IN BOOLEAN      StripQuotation
   )
 {
@@ -126 +130 @@
   }
 
-  StrnCpy(*TempParameter, (*Walker), NextDelim - *Walker);
+  StrnCpyS(*TempParameter, Length / sizeof(CHAR16), (*Walker), NextDelim - *Walker);
 
   //
@@ -160 +164 @@
       // eliminate the unescaped quote
       //
-      CopyMem ((CHAR16*)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));
+      if (StripQuotation) {
+        CopyMem ((CHAR16*)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));
+          } else{
+        NextDelim++;
+          }
     }
   }
@@ -177 +185 @@
   etc... must be complete before calling this API.
 
-  @param[in] CommandLine         String of command line to parse
-  @param[in, out] Argv           pointer to array of strings; one for each parameter
-  @param[in, out] Argc           pointer to number of strings in Argv array
+  @param[in] CommandLine          String of command line to parse
+  @param[in] StripQuotation       if TRUE then strip the quotation marks surrounding
+                                  the parameters.
+  @param[in, out] Argv            pointer to array of strings; one for each parameter
+  @param[in, out] Argc            pointer to number of strings in Argv array
 
   @return EFI_SUCCESS           the operation was sucessful
@@ -185 +195 @@
 **/
 EFI_STATUS
-EFIAPI
 ParseCommandLineToArgs(
   IN CONST CHAR16 *CommandLine,
-  IN OUT CHAR16 ***Argv,
-  IN OUT UINTN *Argc
+  IN BOOLEAN      StripQuotation,
+  IN OUT CHAR16   ***Argv,
+  IN OUT UINTN    *Argc
   )
 {
@@ -196 +206 @@
   CHAR16      *Walker;
   CHAR16      *NewParam;
+  CHAR16      *NewCommandLine;
   UINTN       Size;
+  EFI_STATUS  Status;
 
   ASSERT(Argc != NULL);
@@ -207 +219 @@
   }
 
-  Size = StrSize(CommandLine);
+  NewCommandLine = AllocateCopyPool(StrSize(CommandLine), CommandLine);
+  if (NewCommandLine == NULL){
+    return (EFI_OUT_OF_RESOURCES);
+  }
+
+  TrimSpaces(&NewCommandLine);
+  Size = StrSize(NewCommandLine);
   TempParameter = AllocateZeroPool(Size);
   if (TempParameter == NULL) {
+    SHELL_FREE_NON_NULL(NewCommandLine);
     return (EFI_OUT_OF_RESOURCES);
   }
 
   for ( Count = 0
-      , Walker = (CHAR16*)CommandLine
+      , Walker = (CHAR16*)NewCommandLine
       ; Walker != NULL && *Walker != CHAR_NULL
       ; Count++
       ) {
-    if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size))) {
+    if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size, TRUE))) {
       break;
     }
@@ -228 +247 @@
   (*Argv) = AllocateZeroPool((Count)*sizeof(CHAR16*));
   if (*Argv == NULL) {
-    SHELL_FREE_NON_NULL(TempParameter);
-    return (EFI_OUT_OF_RESOURCES);
+    Status = EFI_OUT_OF_RESOURCES;
+    goto Done;
   }
 
   *Argc = 0;
-  Walker = (CHAR16*)CommandLine;
+  Walker = (CHAR16*)NewCommandLine;
   while(Walker != NULL && *Walker != CHAR_NULL) {
     SetMem16(TempParameter, Size, CHAR_NULL);
-    if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size))) {
-      SHELL_FREE_NON_NULL(TempParameter);
-      return (EFI_INVALID_PARAMETER);
+    if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size, StripQuotation))) {
+      Status = EFI_INVALID_PARAMETER;
+      goto Done;
     }
 
     NewParam = AllocateCopyPool(StrSize(TempParameter), TempParameter);
     if (NewParam == NULL){
-      SHELL_FREE_NON_NULL(TempParameter);
-      return (EFI_OUT_OF_RESOURCES);
+      Status = EFI_OUT_OF_RESOURCES;
+      goto Done;
     }
     ((CHAR16**)(*Argv))[(*Argc)] = NewParam;
@@ -250 +269 @@
   }
   ASSERT(Count >= (*Argc));
+  Status = EFI_SUCCESS;
+
+Done:
   SHELL_FREE_NON_NULL(TempParameter);
-  return (EFI_SUCCESS);
+  SHELL_FREE_NON_NULL(NewCommandLine);
+  return (Status);
 }
 
@@ -271 +294 @@
 **/
 EFI_STATUS
-EFIAPI
 CreatePopulateInstallShellParametersProtocol (
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  **NewShellParameters,
@@ -361 +383 @@
     //
     Status = ParseCommandLineToArgs(FullCommandLine,
+                                    TRUE,
                                     &(*NewShellParameters)->Argv,
                                     &(*NewShellParameters)->Argc);
@@ -412 +435 @@
 **/
 EFI_STATUS
-EFIAPI
 CleanUpShellParametersProtocol (
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *NewShellParameters
@@ -459 +481 @@
 **/
 EFI_STATUS
-EFIAPI
 IsUnicodeFile(
   IN CONST CHAR16 *FileName
@@ -494 +515 @@
 **/
 VOID
-EFIAPI
 StripQuotes (
   IN OUT CHAR16 *TheString
@@ -546 +566 @@
 **/
 CHAR16*
-EFIAPI
 FixFileName (
   IN CHAR16 *FileName
@@ -589 +608 @@
 **/
 CHAR16*
-EFIAPI
 FixVarName (
   IN CHAR16 *FileName
@@ -618 +636 @@
 **/
 EFI_STATUS
-EFIAPI
 RemoveFileTag(
   IN SHELL_FILE_HANDLE *Handle
@@ -682 +699 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateStdInStdOutStdErr(
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
@@ -711 +727 @@
   SPLIT_LIST        *Split;
   CHAR16            *FirstLocation;
+  BOOLEAN           Volatile;
 
   OutUnicode      = TRUE;
   InUnicode       = TRUE;
+  AsciiRedirection = FALSE;
   ErrUnicode      = TRUE;
   StdInVarName    = NULL;
@@ -992 +1010 @@
       StdInFileName   = CommandLineWalker += 4;
       InUnicode       = FALSE;
+      AsciiRedirection = TRUE;
     }
     if (StrStr(CommandLineWalker, L" <a ") != NULL) {
@@ -1013 +1032 @@
   // re-populate the string to support any filenames that were in quotes.
   //
-  StrnCpy(CommandLineCopy, NewCommandLine, StrLen(NewCommandLine));
+  StrnCpyS(CommandLineCopy, StrSize(CommandLineCopy)/sizeof(CHAR16), NewCommandLine, StrLen(NewCommandLine));
 
   if (FirstLocation != CommandLineCopy + StrLen(CommandLineCopy)
-    && ((UINTN)(FirstLocation - CommandLineCopy) < StrLen(NewCommandLine))
+    && (((UINTN)FirstLocation - (UINTN)CommandLineCopy)/sizeof(CHAR16) < StrLen(NewCommandLine))
     ){
-    *(NewCommandLine + (UINTN)(FirstLocation - CommandLineCopy)) = CHAR_NULL;
+    *(NewCommandLine + ((UINTN)FirstLocation - (UINTN)CommandLineCopy)/sizeof(CHAR16)) = CHAR_NULL;
   }
 
@@ -1084 +1103 @@
       // Check for no volatile environment variables
       //
-      ||(StdErrVarName  != NULL && !IsVolatileEnv(StdErrVarName))
-      ||(StdOutVarName  != NULL && !IsVolatileEnv(StdOutVarName))
+      ||(StdErrVarName  != NULL && !EFI_ERROR (IsVolatileEnv (StdErrVarName, &Volatile)) && !Volatile)
+      ||(StdOutVarName  != NULL && !EFI_ERROR (IsVolatileEnv (StdOutVarName, &Volatile)) && !Volatile)
       //
       // Cant redirect during a reconnect operation.
@@ -1146 +1165 @@
           Status = EFI_INVALID_PARAMETER;
         } else {
-          if (StrStr(StdOutFileName, L"NUL")==StdOutFileName) {
+          if (gUnicodeCollation->MetaiMatch (gUnicodeCollation, StdOutFileName, L"NUL")) {
             //no-op
           } else if (!OutAppend && OutUnicode && !EFI_ERROR(Status)) {
@@ -1238 +1257 @@
           EFI_FILE_MODE_READ,
           0);
-        if (InUnicode) {
-          //
-          // Chop off the 0xFEFF if it's there...
-          //
-          RemoveFileTag(&TempHandle);
-        } else if (!EFI_ERROR(Status)) {
-          //
-          // Create the ASCII->Unicode conversion layer
-          //
-          TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);
-        }
         if (!EFI_ERROR(Status)) {
+          if (!InUnicode) {
+            //
+            // Create the ASCII->Unicode conversion layer
+            //
+            TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);
+          }
           ShellParameters->StdIn = TempHandle;
           gST->ConIn = CreateSimpleTextInOnFile(TempHandle, &gST->ConsoleInHandle);
@@ -1284 +1298 @@
 **/
 EFI_STATUS
-EFIAPI
 RestoreStdInStdOutStdErr (
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
@@ -1353 +1366 @@
   @param[in, out] ShellParameters        Pointer to parameter structure to modify.
   @param[in] NewCommandLine              The new command line to parse and use.
+  @param[in] Type                        The type of operation.
   @param[out] OldArgv                    Pointer to old list of parameters.
   @param[out] OldArgc                    Pointer to old number of items in Argv list.
@@ -1360 +1374 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateArgcArgv(
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
   IN CONST CHAR16                       *NewCommandLine,
+  IN SHELL_OPERATION_TYPES              Type,
   OUT CHAR16                            ***OldArgv OPTIONAL,
   OUT UINTN                             *OldArgc OPTIONAL
   )
 {
+  BOOLEAN                 StripParamQuotation;
+
   ASSERT(ShellParameters != NULL);
+  StripParamQuotation = TRUE;
 
   if (OldArgc != NULL) {
@@ -1377 +1394 @@
   }
 
-  return (ParseCommandLineToArgs(NewCommandLine, &(ShellParameters->Argv), &(ShellParameters->Argc)));
+  if (Type == Script_File_Name) {
+    StripParamQuotation = FALSE;
+  }
+
+  return ParseCommandLineToArgs( NewCommandLine,
+                                 StripParamQuotation,
+                                 &(ShellParameters->Argv),
+                                 &(ShellParameters->Argc)
+                                );
 }
 
@@ -1390 +1415 @@
 **/
 VOID
-EFIAPI
 RestoreArgcArgv(
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ShellParametersProtocol.h

@@ -19 +19 @@
 #include "Shell.h"
 
+typedef enum {
+  Internal_Command,
+  Script_File_Name,
+  Efi_Application,
+  File_Sys_Change,
+  Unknown_Invalid
+} SHELL_OPERATION_TYPES;
+
 /**
   creates a new EFI_SHELL_PARAMETERS_PROTOCOL instance and populates it and then
@@ -36 +44 @@
 **/
 EFI_STATUS
-EFIAPI
 CreatePopulateInstallShellParametersProtocol (
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  **NewShellParameters,
@@ -55 +62 @@
 **/
 EFI_STATUS
-EFIAPI
 CleanUpShellParametersProtocol (
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *NewShellParameters
@@ -67 +73 @@
   @param[in, out] ShellParameters       pointer to parameter structure to modify
   @param[in] NewCommandLine             the new command line to parse and use
+  @param[in] Type                       the type of operation.
   @param[out] OldArgv                   pointer to old list of parameters
   @param[out] OldArgc                   pointer to old number of items in Argv list
@@ -74 +81 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateArgcArgv(
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
   IN CONST CHAR16                       *NewCommandLine,
+  IN SHELL_OPERATION_TYPES              Type,
   OUT CHAR16                            ***OldArgv,
   OUT UINTN                             *OldArgc
@@ -92 +99 @@
 **/
 VOID
-EFIAPI
 RestoreArgcArgv(
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
@@ -126 +132 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateStdInStdOutStdErr(
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
@@ -147 +152 @@
 **/
 EFI_STATUS
-EFIAPI
 RestoreStdInStdOutStdErr (
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,
@@ -163 +167 @@
   delimited and quote surrounded parameter definition.
 
-  @param[in] CommandLine         String of command line to parse
-  @param[in, out] Argv           pointer to array of strings; one for each parameter
-  @param[in, out] Argc           pointer to number of strings in Argv array
+  @param[in] CommandLine          String of command line to parse
+  @param[in] StripQuotation       if TRUE then strip the quotation marks surrounding
+                                  the parameters.
+  @param[in, out] Argv            pointer to array of strings; one for each parameter
+  @param[in, out] Argc            pointer to number of strings in Argv array
 
   @return EFI_SUCCESS           the operation was sucessful
@@ -171 +177 @@
 **/
 EFI_STATUS
-EFIAPI
 ParseCommandLineToArgs(
   IN CONST CHAR16 *CommandLine,
-  IN OUT CHAR16 ***Argv,
-  IN OUT UINTN *Argc
+  IN BOOLEAN      StripQuotation,
+  IN OUT CHAR16   ***Argv,
+  IN OUT UINTN    *Argc
   );
 
@@ -188 +194 @@
   function.
 
-  @param[in, out] Walker        pointer to string of command line.  Adjusted to
-                                reminaing command line on return
-  @param[in, out] TempParameter pointer to string of command line item extracted.
-  @param[in]      Length        Length of (*TempParameter) in bytes
+  @param[in, out] Walker          pointer to string of command line.  Adjusted to
+                                  reminaing command line on return
+  @param[in, out] TempParameter   pointer to string of command line item extracted.
+  @param[in]      Length          Length of (*TempParameter) in bytes
+  @param[in]      StripQuotation  if TRUE then strip the quotation marks surrounding
+                                  the parameters.
 
   @return   EFI_INALID_PARAMETER  A required parameter was NULL or pointed to a NULL or empty string.
@@ -197 +205 @@
 **/
 EFI_STATUS
-EFIAPI
 GetNextParameter(
   IN OUT CHAR16   **Walker,
   IN OUT CHAR16   **TempParameter,
-  IN CONST UINTN  Length
+  IN CONST UINTN  Length,
+  IN BOOLEAN      StripQuotation
   );
 

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

@@ -3 +3 @@
   manipulation, and initialization of EFI_SHELL_PROTOCOL.
 
-  (C) Copyright 2014, Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -50 +51 @@
 **/
 BOOLEAN
-EFIAPI
 InternalShellProtocolIsBlockIoPresent(
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
@@ -80 +80 @@
 **/
 BOOLEAN
-EFIAPI
 InternalShellProtocolIsSimpleFileSystemPresent(
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
@@ -113 +112 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalShellProtocolDebugPrintMessage (
   IN CONST CHAR16                   *Mapping,
@@ -186 +184 @@
           if (StringNoCaseCompare(&MapListNode->MapName, &Mapping) == 0) {
             RemoveEntryList(&MapListNode->Link);
+            SHELL_FREE_NON_NULL(MapListNode->DevicePath);
+            SHELL_FREE_NON_NULL(MapListNode->MapName);
+            SHELL_FREE_NON_NULL(MapListNode->CurrentDirectoryPath);
             FreePool(MapListNode);
             return (EFI_SUCCESS);
@@ -450 +451 @@
          ){
         //
-        // all the rest should be file path nodes
+        // If any node is not a file path node, then the conversion can not be completed
         //
         if ((DevicePathType(&FilePath->Header) != MEDIA_DEVICE_PATH) ||
             (DevicePathSubType(&FilePath->Header) != MEDIA_FILEPATH_DP)) {
           FreePool(PathForReturn);
-          PathForReturn = NULL;
-          ASSERT(FALSE);
-        } else {
-          //
-          // append the path part onto the filepath.
-          //
-          ASSERT((PathForReturn == NULL && PathSize == 0) || (PathForReturn != NULL));
-
-          AlignedNode = AllocateCopyPool (DevicePathNodeLength(FilePath), FilePath);
-          ASSERT (AlignedNode != NULL);
-
-          // File Path Device Path Nodes 'can optionally add a "\" separator to
-          //  the beginning and/or the end of the Path Name string.'
-          // (UEFI Spec 2.4 section 9.3.6.4).
-          // If necessary, add a "\", but otherwise don't
-          // (This is specified in the above section, and also implied by the
-          //  UEFI Shell spec section 3.7)
-          if ((PathSize != 0)                        &&
-              (PathForReturn != NULL)                &&
-              (PathForReturn[PathSize - 1] != L'\\') &&
-              (AlignedNode->PathName[0]    != L'\\')) {
-            PathForReturn = StrnCatGrow (&PathForReturn, &PathSize, L"\\", 1);
-          }
-
-          PathForReturn = StrnCatGrow(&PathForReturn, &PathSize, AlignedNode->PathName, 0);
-          FreePool(AlignedNode);
+          return NULL;
         }
+
+        //
+        // append the path part onto the filepath.
+        //
+        ASSERT((PathForReturn == NULL && PathSize == 0) || (PathForReturn != NULL));
+
+        AlignedNode = AllocateCopyPool (DevicePathNodeLength(FilePath), FilePath);
+        if (AlignedNode == NULL) {
+          FreePool (PathForReturn);
+          return NULL;
+        }
+
+        // File Path Device Path Nodes 'can optionally add a "\" separator to
+        //  the beginning and/or the end of the Path Name string.'
+        // (UEFI Spec 2.4 section 9.3.6.4).
+        // If necessary, add a "\", but otherwise don't
+        // (This is specified in the above section, and also implied by the
+        //  UEFI Shell spec section 3.7)
+        if ((PathSize != 0)                        &&
+            (PathForReturn != NULL)                &&
+            (PathForReturn[PathSize / sizeof (CHAR16) - 1] != L'\\') &&
+            (AlignedNode->PathName[0]    != L'\\')) {
+          PathForReturn = StrnCatGrow (&PathForReturn, &PathSize, L"\\", 1);
+        }
+
+        PathForReturn = StrnCatGrow(&PathForReturn, &PathSize, AlignedNode->PathName, 0);
+        FreePool(AlignedNode);
       } // for loop of remaining nodes
     }
@@ -533 +536 @@
       return (NULL);
     }
-    Size = StrSize(Cwd) + StrSize(Path) - sizeof(CHAR16);
+    Size = StrSize(Cwd) + StrSize(Path);
     NewPath = AllocateZeroPool(Size);
     if (NewPath == NULL) {
       return (NULL);
     }
-    StrnCpy(NewPath, Cwd, Size/sizeof(CHAR16)-1);
+    StrCpyS(NewPath, Size/sizeof(CHAR16), Cwd);
+    StrCatS(NewPath, Size/sizeof(CHAR16), L"\\");
     if (*Path == L'\\') {
       Path++;
       while (PathRemoveLastItem(NewPath)) ;
     }
-    StrnCat(NewPath, Path, Size/sizeof(CHAR16) - 1 - StrLen(NewPath));
+    StrCatS(NewPath, Size/sizeof(CHAR16), Path);
     DevicePathForReturn = EfiShellGetDevicePathFromFilePath(NewPath);
     FreePool(NewPath);
@@ -595 +599 @@
   // build the full device path
   //
-  if (*(Path+StrLen(MapName)+1) == CHAR_NULL) {
+  if ((*(Path+StrLen(MapName)) != CHAR_NULL) &&
+      (*(Path+StrLen(MapName)+1) == CHAR_NULL)) {
     DevicePathForReturn = FileDevicePath(Handle, L"\\");
   } else {
@@ -823 +828 @@
                                 could not be opened.
   @retval EFI_VOLUME_CORRUPTED  The data structures in the volume were corrupted.
-  @retval EFI_DEVICE_ERROR      The device had an error
+  @retval EFI_DEVICE_ERROR      The device had an error.
+  @retval Others                Error status returned from EFI_SIMPLE_FILE_SYSTEM_PROTOCOL->OpenVolume().
 **/
 EFI_STATUS
@@ -863 +869 @@
   //
   Status = SimpleFileSystem->OpenVolume(SimpleFileSystem, &RealFileHandle);
+  if (EFI_ERROR(Status)) {
+    return Status;
+  }
+
   *FileHandle = ConvertEfiFileProtocolToShellHandle(RealFileHandle, EfiShellGetMapFromDevicePath(&DevPath));
-  return (Status);
+  return (EFI_SUCCESS);
 }
 
@@ -945 +955 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalOpenFileDevicePath(
   IN OUT EFI_DEVICE_PATH_PROTOCOL *DevicePath,
@@ -1127 +1136 @@
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
   EFI_STATUS                Status;
+  BOOLEAN                   Volatile;
 
   //
@@ -1133 +1143 @@
   //
   if (StrStr(FileName, L">v") == FileName) {
-    if (!IsVolatileEnv(FileName+2)) {
+    Status = IsVolatileEnv (FileName + 2, &Volatile);
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+    if (!Volatile) {
       return (EFI_INVALID_PARAMETER);
     }
@@ -1243 +1257 @@
   EFI_DEVICE_PATH_PROTOCOL        *DevicePath;
   EFI_STATUS                      Status;
+  BOOLEAN                         Volatile;
 
   *FileHandle = NULL;
@@ -1276 +1291 @@
 
   //
-  // Is this for NUL file
-  //
-  if (StrCmp(FileName, L"NUL") == 0) {
+  // Is this for NUL / NULL file
+  //
+  if ((gUnicodeCollation->StriColl (gUnicodeCollation, (CHAR16*)FileName, L"NUL") == 0) ||
+      (gUnicodeCollation->StriColl (gUnicodeCollation, (CHAR16*)FileName, L"NULL") == 0)) {
     *FileHandle = &FileInterfaceNulFile;
     return (EFI_SUCCESS);
@@ -1302 +1318 @@
   //
   if (StrStr(FileName, L">v") == FileName) {
-    if (!IsVolatileEnv(FileName+2) &&
+    Status = IsVolatileEnv (FileName + 2, &Volatile);
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+    if (!Volatile &&
         ((OpenMode & EFI_FILE_MODE_WRITE) != 0)) {
       return (EFI_INVALID_PARAMETER);
@@ -1362 +1382 @@
   // now delete the file
   //
+  ShellFileHandleRemove(FileHandle);
   return (ShellInfoObject.NewEfiShellProtocol->DeleteFile(FileHandle));
 }
@@ -1412 +1433 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalShellExecuteDevicePath(
   IN CONST EFI_HANDLE               *ParentImageHandle,
@@ -1438 +1458 @@
 
   InitializeListHead(&OrigEnvs);
+  ZeroMem(&ShellParamsProtocol, sizeof(EFI_SHELL_PARAMETERS_PROTOCOL));
 
   NewHandle = NULL;
@@ -1468 +1489 @@
       gBS->UnloadImage(NewHandle);
     }
+    FreePool (NewCmdLine);
     return (Status);
   }
@@ -1479 +1501 @@
 
   if (!EFI_ERROR(Status)) {
+    //
+    // If the image is not an app abort it.
+    //
+    if (LoadedImage->ImageCodeType != EfiLoaderCode){
+      ShellPrintHiiEx(
+        -1,
+        -1,
+        NULL,
+        STRING_TOKEN (STR_SHELL_IMAGE_NOT_APP),
+        ShellInfoObject.HiiHandle
+      );
+      goto UnloadImage;
+    }
+
     ASSERT(LoadedImage->LoadOptionsSize == 0);
     if (NewCmdLine != NULL) {
@@ -1501 +1537 @@
     ShellParamsProtocol.StdOut  = ShellInfoObject.NewShellParametersProtocol->StdOut;
     ShellParamsProtocol.StdErr  = ShellInfoObject.NewShellParametersProtocol->StdErr;
-    Status = UpdateArgcArgv(&ShellParamsProtocol, NewCmdLine, NULL, NULL);
+    Status = UpdateArgcArgv(&ShellParamsProtocol, NewCmdLine, Efi_Application, NULL, NULL);
     ASSERT_EFI_ERROR(Status);
     //
@@ -1584 +1620 @@
   return(Status);
 }
+
+/**
+  internal worker function to load and run an image in the current shell.
+
+  @param CommandLine            Points to the NULL-terminated UCS-2 encoded string
+                                containing the command line. If NULL then the command-
+                                line will be empty.
+  @param Environment            Points to a NULL-terminated array of environment
+                                variables with the format 'x=y', where x is the
+                                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 the command line.
+
+  @retval EFI_SUCCESS       The command executed successfully. The  status code
+                            returned by the command is pointed to by StatusCode.
+  @retval EFI_INVALID_PARAMETER The parameters are invalid.
+  @retval EFI_OUT_OF_RESOURCES Out of resources.
+  @retval EFI_UNSUPPORTED   Nested shell invocations are not allowed.
+**/
+EFI_STATUS
+InternalShellExecute(
+  IN CONST CHAR16                   *CommandLine OPTIONAL,
+  IN CONST CHAR16                   **Environment OPTIONAL,
+  OUT EFI_STATUS                    *StartImageStatus OPTIONAL
+  )
+{
+  EFI_STATUS                    Status;
+  EFI_STATUS                    CleanupStatus;
+  LIST_ENTRY                    OrigEnvs;
+
+  InitializeListHead(&OrigEnvs);
+
+  //
+  // Save our current environment settings for later restoration if necessary
+  //
+  if (Environment != NULL) {
+    Status = GetEnvironmentVariableList(&OrigEnvs);
+    if (!EFI_ERROR(Status)) {
+      Status = SetEnvironmentVariables(Environment);
+    } else {
+      return Status;
+    }
+  }
+
+  Status = RunShellCommand(CommandLine, StartImageStatus);
+
+  // Restore environment variables
+  if (!IsListEmpty(&OrigEnvs)) {
+    CleanupStatus = SetEnvironmentVariableList(&OrigEnvs);
+    ASSERT_EFI_ERROR (CleanupStatus);
+  }
+
+  return(Status);
+}
+
+/**
+  Determine if the UEFI Shell is currently running with nesting enabled or disabled.
+
+  @retval FALSE   nesting is required
+  @retval other   nesting is enabled
+**/
+STATIC
+BOOLEAN
+NestingEnabled(
+  VOID
+)
+{
+  EFI_STATUS  Status;
+  CHAR16      *Temp;
+  CHAR16      *Temp2;
+  UINTN       TempSize;
+  BOOLEAN     RetVal;
+
+  RetVal = TRUE;
+  Temp   = NULL;
+  Temp2  = NULL;
+
+  if (ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest) {
+    TempSize = 0;
+    Temp     = NULL;
+    Status = SHELL_GET_ENVIRONMENT_VARIABLE(mNoNestingEnvVarName, &TempSize, Temp);
+    if (Status == EFI_BUFFER_TOO_SMALL) {
+      Temp = AllocateZeroPool(TempSize + sizeof(CHAR16));
+      if (Temp != NULL) {
+        Status = SHELL_GET_ENVIRONMENT_VARIABLE(mNoNestingEnvVarName, &TempSize, Temp);
+      }
+    }
+    Temp2 = StrnCatGrow(&Temp2, NULL, mNoNestingTrue, 0);
+    if (Temp != NULL && Temp2 != NULL && StringNoCaseCompare(&Temp, &Temp2) == 0) {
+      //
+      // Use the no nesting method.
+      //
+      RetVal = FALSE;
+    }
+  }
+
+  SHELL_FREE_NON_NULL(Temp);
+  SHELL_FREE_NON_NULL(Temp2);
+  return (RetVal);
+}
+
 /**
   Execute the command line.
@@ -1607 +1745 @@
                             environment variable name and y is the value. If this
                             is NULL, then the current shell environment is used.
-  @param StatusCode         Points to the status code returned by the command.
+  @param StatusCode         Points to the status code returned by the CommandLine.
 
   @retval EFI_SUCCESS       The command executed successfully. The  status code
@@ -1636 +1774 @@
   }
 
-  DevPath = AppendDevicePath (ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath);
-
-  DEBUG_CODE_BEGIN();
-  Temp = ConvertDevicePathToText(ShellInfoObject.FileDevPath, TRUE, TRUE);
-  FreePool(Temp);
-  Temp = ConvertDevicePathToText(ShellInfoObject.ImageDevPath, TRUE, TRUE);
-  FreePool(Temp);
-  Temp = ConvertDevicePathToText(DevPath, TRUE, TRUE);
-  FreePool(Temp);
-  DEBUG_CODE_END();
-
-  Temp = NULL;
-  Size = 0;
-  ASSERT((Temp == NULL && Size == 0) || (Temp != NULL));
-  StrnCatGrow(&Temp, &Size, L"Shell.efi -_exit ", 0);
-  StrnCatGrow(&Temp, &Size, CommandLine, 0);
-
-  Status = InternalShellExecuteDevicePath(
-    ParentImageHandle,
-    DevPath,
-    Temp,
-    (CONST CHAR16**)Environment,
-    StatusCode);
-
-  //
-  // de-allocate and return
-  //
-  FreePool(DevPath);
-  FreePool(Temp);
+  if (NestingEnabled()) {
+    DevPath = AppendDevicePath (ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath);
+
+    DEBUG_CODE_BEGIN();
+    Temp = ConvertDevicePathToText(ShellInfoObject.FileDevPath, TRUE, TRUE);
+    FreePool(Temp);
+    Temp = ConvertDevicePathToText(ShellInfoObject.ImageDevPath, TRUE, TRUE);
+    FreePool(Temp);
+    Temp = ConvertDevicePathToText(DevPath, TRUE, TRUE);
+    FreePool(Temp);
+    DEBUG_CODE_END();
+
+    Temp = NULL;
+    Size = 0;
+    ASSERT((Temp == NULL && Size == 0) || (Temp != NULL));
+    StrnCatGrow(&Temp, &Size, L"Shell.efi -exit ", 0);
+    StrnCatGrow(&Temp, &Size, CommandLine, 0);
+
+    Status = InternalShellExecuteDevicePath(
+      ParentImageHandle,
+      DevPath,
+      Temp,
+      (CONST CHAR16**)Environment,
+      StatusCode);
+
+    //
+    // de-allocate and return
+    //
+    FreePool(DevPath);
+    FreePool(Temp);
+  } else {
+    Status = InternalShellExecute(
+      (CONST CHAR16*)CommandLine,
+      (CONST CHAR16**)Environment,
+      StatusCode);
+  }
+
   return(Status);
 }
@@ -1677 +1823 @@
 **/
 VOID
-EFIAPI
 InternalFreeShellFileInfoNode(
   IN EFI_SHELL_FILE_INFO *FileListNode
@@ -1805 +1950 @@
 **/
 EFI_SHELL_FILE_INFO*
-EFIAPI
 InternalDuplicateShellFileInfo(
   IN       EFI_SHELL_FILE_INFO *Node,
@@ -1858 +2002 @@
 **/
 EFI_SHELL_FILE_INFO *
-EFIAPI
 CreateAndPopulateShellFileInfo(
   IN CONST CHAR16 *BasePath,
@@ -2002 +2145 @@
       ; Status = FileHandleFindNextFile(FileDirHandle, FileInfo, &NoFile)
      ){
+    if (ShellFileList == NULL) {
+      ShellFileList = (EFI_SHELL_FILE_INFO*)AllocateZeroPool(sizeof(EFI_SHELL_FILE_INFO));
+      if (ShellFileList == NULL) {
+        SHELL_FREE_NON_NULL (BasePath);
+        return EFI_OUT_OF_RESOURCES;
+      }
+      InitializeListHead(&ShellFileList->Link);
+    }
     //
     // allocate a new EFI_SHELL_FILE_INFO and populate it...
@@ -2011 +2162 @@
       NULL,         // no handle since not open
       FileInfo);
-
-    if (ShellFileList == NULL) {
-      ShellFileList = (EFI_SHELL_FILE_INFO*)AllocateZeroPool(sizeof(EFI_SHELL_FILE_INFO));
-      ASSERT(ShellFileList != NULL);
-      InitializeListHead(&ShellFileList->Link);
+    if (ShellFileListItem == NULL) {
+      Status = EFI_OUT_OF_RESOURCES;
+      //
+      // Free resources outside the loop.
+      //
+      break;
     }
     InsertTailList(&ShellFileList->Link, &ShellFileListItem->Link);
@@ -2063 +2215 @@
 
   if (!EFI_ERROR(Status)) {
-    CopyGuid(NewGuid, Guid);
+    CopyGuid(Guid, NewGuid);
   }
 
@@ -2120 +2272 @@
 **/
 EFI_STATUS
-EFIAPI
 UpdateFileName(
   IN CONST CHAR16 *BasePath,
@@ -2181 +2332 @@
 **/
 EFI_STATUS
-EFIAPI
 ShellSearchHandle(
   IN     CONST CHAR16                         *FilePattern,
@@ -2220 +2370 @@
 
   CurrentFilePattern = AllocateZeroPool((NextFilePatternStart-FilePattern+1)*sizeof(CHAR16));
-  ASSERT(CurrentFilePattern != NULL);
-  StrnCpy(CurrentFilePattern, FilePattern, NextFilePatternStart-FilePattern);
+  if (CurrentFilePattern == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  StrnCpyS(CurrentFilePattern, NextFilePatternStart-FilePattern+1, FilePattern, NextFilePatternStart-FilePattern);
 
   if (CurrentFilePattern[0]   == CHAR_NULL
@@ -2279 +2432 @@
         if (UnicodeCollation->MetaiMatch(UnicodeCollation, (CHAR16*)ShellInfoNode->FileName, CurrentFilePattern)){
           if (ShellInfoNode->FullName != NULL && StrStr(ShellInfoNode->FullName, L":") == NULL) {
-            Size = StrSize(ShellInfoNode->FullName);
-            Size += StrSize(MapName) + sizeof(CHAR16);
+            Size = StrSize (ShellInfoNode->FullName) + StrSize (MapName);
             NewFullName = AllocateZeroPool(Size);
             if (NewFullName == NULL) {
               Status = EFI_OUT_OF_RESOURCES;
             } else {
-              StrnCpy(NewFullName, MapName, Size/sizeof(CHAR16)-1);
-              StrnCat(NewFullName, ShellInfoNode->FullName+1, (Size/sizeof(CHAR16))-StrLen(NewFullName)-1);
-              FreePool((VOID*)ShellInfoNode->FullName);
+              StrCpyS(NewFullName, Size / sizeof(CHAR16), MapName);
+              StrCatS(NewFullName, Size / sizeof(CHAR16), ShellInfoNode->FullName);
+              FreePool ((VOID *) ShellInfoNode->FullName);
               ShellInfoNode->FullName = NewFullName;
             }
@@ -2317 +2469 @@
               //
               Status = ShellSearchHandle(NextFilePatternStart, UnicodeCollation, ShellInfoNode->Handle, FileList, ShellInfoNode, MapName);
+              EfiShellClose(ShellInfoNode->Handle);
+              ShellInfoNode->Handle = NULL;
             }
           } else if (!EFI_ERROR(Status)) {
@@ -2327 +2481 @@
             //
             NewShellNode = InternalDuplicateShellFileInfo(ShellInfoNode, FALSE);
-            ASSERT(NewShellNode != NULL);
             if (NewShellNode == NULL) {
               Status = EFI_OUT_OF_RESOURCES;
@@ -2354 +2507 @@
   }
 
+  if (*FileList == NULL || (*FileList != NULL && IsListEmpty(&(*FileList)->Link))) {
+    Status = EFI_NOT_FOUND;
+  }
+
   FreePool(CurrentFilePattern);
   return (Status);
@@ -2416 +2573 @@
   PatternCopy = PathCleanUpDirectories(PatternCopy);
 
-  Count = StrStr(PatternCopy, L":") - PatternCopy;
-  Count += 2;
+  Count = StrStr(PatternCopy, L":") - PatternCopy + 1;
+  ASSERT (Count <= StrLen (PatternCopy));
 
   ASSERT(MapName == NULL);
@@ -2435 +2592 @@
         PatternCurrentLocation++;
         Status = ShellSearchHandle(PatternCurrentLocation, gUnicodeCollation, RootFileHandle, FileList, NULL, MapName);
+        EfiShellClose(RootFileHandle);
       }
       FreePool(RootDevicePath);
@@ -2496 +2654 @@
     ASSERT((Path2 == NULL && Path2Size == 0) || (Path2 != NULL));
     StrnCatGrow(&Path2, &Path2Size, CurDir, 0);
+    StrnCatGrow(&Path2, &Path2Size, L"\\", 0);
     if (*Path == L'\\') {
       Path++;
@@ -2572 +2731 @@
   VOID        *Buffer;
   UINTN       Size;
-  LIST_ENTRY  List;
   ENV_VAR_LIST *Node;
   CHAR16      *CurrentWriteLocation;
@@ -2580 +2738 @@
 
   if (Name == NULL) {
-    //
-    // Get all our environment variables
-    //
-    InitializeListHead(&List);
-    Status = GetEnvironmentVariableList(&List);
-    if (EFI_ERROR(Status)){
-      return (NULL);
-    }
 
     //
     // Build the semi-colon delimited list. (2 passes)
     //
-    for ( Node = (ENV_VAR_LIST*)GetFirstNode(&List)
-      ; !IsNull(&List, &Node->Link)
-      ; Node = (ENV_VAR_LIST*)GetNextNode(&List, &Node->Link)
+    for ( Node = (ENV_VAR_LIST*)GetFirstNode(&gShellEnvVarList.Link)
+      ; !IsNull(&gShellEnvVarList.Link, &Node->Link)
+      ; Node = (ENV_VAR_LIST*)GetNextNode(&gShellEnvVarList.Link, &Node->Link)
      ){
       ASSERT(Node->Key != NULL);
@@ -2604 +2754 @@
     Buffer = AllocateZeroPool(Size);
     if (Buffer == NULL) {
-      if (!IsListEmpty (&List)) {
-        FreeEnvironmentVariableList(&List);
-      }
       return (NULL);
     }
     CurrentWriteLocation = (CHAR16*)Buffer;
 
-    for ( Node = (ENV_VAR_LIST*)GetFirstNode(&List)
-      ; !IsNull(&List, &Node->Link)
-      ; Node = (ENV_VAR_LIST*)GetNextNode(&List, &Node->Link)
+    for ( Node = (ENV_VAR_LIST*)GetFirstNode(&gShellEnvVarList.Link)
+      ; !IsNull(&gShellEnvVarList.Link, &Node->Link)
+      ; Node = (ENV_VAR_LIST*)GetNextNode(&gShellEnvVarList.Link, &Node->Link)
      ){
       ASSERT(Node->Key != NULL);
-      StrnCpy(CurrentWriteLocation, Node->Key,  (Size)/sizeof(CHAR16) - (CurrentWriteLocation - ((CHAR16*)Buffer)) - 1);
+      StrCpyS( CurrentWriteLocation,
+                (Size)/sizeof(CHAR16) - (CurrentWriteLocation - ((CHAR16*)Buffer)),
+                Node->Key
+                );
       CurrentWriteLocation += StrLen(CurrentWriteLocation) + 1;
     }
 
-    //
-    // Free the list...
-    //
-    if (!IsListEmpty (&List)) {
-      FreeEnvironmentVariableList(&List);
-    }
   } else {
     //
     // We are doing a specific environment variable
     //
-
-    //
-    // get the size we need for this EnvVariable
-    //
-    Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(Name, Attributes, &Size, Buffer);
-    if (Status == EFI_BUFFER_TOO_SMALL) {
+    Status = ShellFindEnvVarInList(Name, (CHAR16**)&Buffer, &Size, Attributes);
+
+    if (EFI_ERROR(Status)){
       //
-      // Allocate the space and recall the get function
+      // get the size we need for this EnvVariable
       //
-      Buffer = AllocateZeroPool(Size);
       Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(Name, Attributes, &Size, Buffer);
-    }
-    //
-    // we didnt get it (might not exist)
-    // free the memory if we allocated any and return NULL
-    //
-    if (EFI_ERROR(Status)) {
-      if (Buffer != NULL) {
-        FreePool(Buffer);
+      if (Status == EFI_BUFFER_TOO_SMALL) {
+        //
+        // Allocate the space and recall the get function
+        //
+        Buffer = AllocateZeroPool(Size);
+        Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(Name, Attributes, &Size, Buffer);
       }
-      return (NULL);
+      //
+      // we didnt get it (might not exist)
+      // free the memory if we allocated any and return NULL
+      //
+      if (EFI_ERROR(Status)) {
+        if (Buffer != NULL) {
+          FreePool(Buffer);
+        }
+        return (NULL);
+      } else {
+        //
+        // If we did not find the environment variable in the gShellEnvVarList
+        // but get it from UEFI variable storage successfully then we need update
+        // the gShellEnvVarList.
+        //
+        ShellFreeEnvVarList ();
+        Status = ShellInitEnvVarList ();
+        ASSERT (Status == EFI_SUCCESS);
+      }
     }
   }
@@ -2703 +2859 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalEfiShellSetEnv(
   IN CONST CHAR16 *Name,
@@ -2710 +2865 @@
   )
 {
+  EFI_STATUS      Status;
+
   if (Value == NULL || StrLen(Value) == 0) {
-    return (SHELL_DELETE_ENVIRONMENT_VARIABLE(Name));
+    Status = SHELL_DELETE_ENVIRONMENT_VARIABLE(Name);
+    if (!EFI_ERROR(Status)) {
+      ShellRemvoeEnvVarFromList(Name);
+    }
   } else {
     SHELL_DELETE_ENVIRONMENT_VARIABLE(Name);
-    if (Volatile) {
-      return (SHELL_SET_ENVIRONMENT_VARIABLE_V(Name, StrSize(Value), Value));
-    } else {
-      return (SHELL_SET_ENVIRONMENT_VARIABLE_NV(Name, StrSize(Value), Value));
-    }
-  }
+    Status = ShellAddEnvVarToList(
+               Name, Value, StrSize(Value),
+               EFI_VARIABLE_BOOTSERVICE_ACCESS | (Volatile ? 0 : EFI_VARIABLE_NON_VOLATILE)
+               );
+    if (!EFI_ERROR (Status)) {
+      Status = Volatile
+             ? SHELL_SET_ENVIRONMENT_VARIABLE_V (Name, StrSize (Value) - sizeof (CHAR16), Value)
+             : SHELL_SET_ENVIRONMENT_VARIABLE_NV (Name, StrSize (Value) - sizeof (CHAR16), Value);
+      if (EFI_ERROR (Status)) {
+        ShellRemvoeEnvVarFromList(Name);
+      }
+    }
+  }
+  return Status;
 }
 
@@ -2781 +2949 @@
         (CHAR16*)Name,
         L"uefiversion") == 0
+    ||(!ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest &&
+      gUnicodeCollation->StriColl(
+        gUnicodeCollation,
+        (CHAR16*)Name,
+        (CHAR16*)mNoNestingEnvVarName) == 0)
        ){
     return (EFI_INVALID_PARAMETER);
@@ -2794 +2967 @@
   FileSystemMapping. In both cases, the returned name includes the file system
   mapping (i.e. fs0:\current-dir).
+
+  Note that the current directory string should exclude the tailing backslash character.
 
   @param FileSystemMapping      A pointer to the file system mapping. If NULL,
@@ -2850 +3025 @@
   %cwd% environment variable will be updated
 
+  Note that the current directory string should exclude the tailing backslash character.
+
   @param FileSystem             A pointer to the file system's mapped name. If NULL, then the current working
                                 directory is changed.
@@ -2910 +3087 @@
       //
       if (MapListItem != NULL) {
-        gShellCurDir = MapListItem;
+        gShellCurMapping = MapListItem;
       }
     } else {
-      MapListItem = gShellCurDir;
+      MapListItem = gShellCurMapping;
     }
 
     if (MapListItem == NULL) {
+      FreePool (DirectoryName);
+      SHELL_FREE_NON_NULL(MapName);
       return (EFI_NOT_FOUND);
     }
@@ -2933 +3112 @@
         MapListItem->CurrentDirectoryPath = StrnCatGrow(&MapListItem->CurrentDirectoryPath, &Size, DirectoryName+StrLen(MapName), 0);
       }
+      FreePool (MapName);
     } else {
       ASSERT((MapListItem->CurrentDirectoryPath == NULL && Size == 0) || (MapListItem->CurrentDirectoryPath != NULL));
       MapListItem->CurrentDirectoryPath = StrnCatGrow(&MapListItem->CurrentDirectoryPath, &Size, DirectoryName, 0);
     }
-    if ((MapListItem->CurrentDirectoryPath != NULL && MapListItem->CurrentDirectoryPath[StrLen(MapListItem->CurrentDirectoryPath)-1] != L'\\') || (MapListItem->CurrentDirectoryPath == NULL)) {
+    if ((MapListItem->CurrentDirectoryPath != NULL && MapListItem->CurrentDirectoryPath[StrLen(MapListItem->CurrentDirectoryPath)-1] == L'\\') || (MapListItem->CurrentDirectoryPath == NULL)) {
       ASSERT((MapListItem->CurrentDirectoryPath == NULL && Size == 0) || (MapListItem->CurrentDirectoryPath != NULL));
-      MapListItem->CurrentDirectoryPath = StrnCatGrow(&MapListItem->CurrentDirectoryPath, &Size, L"\\", 0);
+      if (MapListItem->CurrentDirectoryPath != NULL) {
+        MapListItem->CurrentDirectoryPath[StrLen(MapListItem->CurrentDirectoryPath)-1] = CHAR_NULL;
+    }
     }
   } else {
@@ -2946 +3128 @@
     //
     if (StrStr(DirectoryName, L":") != NULL) {
+      FreePool (DirectoryName);
       return (EFI_INVALID_PARAMETER);
     }
@@ -2953 +3136 @@
     MapListItem = ShellCommandFindMapItem(FileSystem);
     if (MapListItem == NULL) {
+      FreePool (DirectoryName);
       return (EFI_INVALID_PARAMETER);
     }
-//    gShellCurDir = MapListItem;
+//    gShellCurMapping = MapListItem;
     if (DirectoryName != NULL) {
       //
@@ -2971 +3155 @@
       ASSERT((MapListItem->CurrentDirectoryPath == NULL && Size == 0) || (MapListItem->CurrentDirectoryPath != NULL));
       MapListItem->CurrentDirectoryPath = StrnCatGrow(&MapListItem->CurrentDirectoryPath, &Size, DirectoryName, 0);
-      if (MapListItem->CurrentDirectoryPath != NULL && MapListItem->CurrentDirectoryPath[StrLen(MapListItem->CurrentDirectoryPath)-1] != L'\\') {
+      if (MapListItem->CurrentDirectoryPath != NULL && MapListItem->CurrentDirectoryPath[StrLen(MapListItem->CurrentDirectoryPath)-1] == L'\\') {
         ASSERT((MapListItem->CurrentDirectoryPath == NULL && Size == 0) || (MapListItem->CurrentDirectoryPath != NULL));
-        MapListItem->CurrentDirectoryPath = StrnCatGrow(&MapListItem->CurrentDirectoryPath, &Size, L"\\", 0);
+        MapListItem->CurrentDirectoryPath[StrLen(MapListItem->CurrentDirectoryPath)-1] = CHAR_NULL;
       }
     }
   }
+  FreePool (DirectoryName);
   //
   // if updated the current directory then update the environment variable
   //
-  if (MapListItem == gShellCurDir) {
+  if (MapListItem == gShellCurMapping) {
     Size = 0;
     ASSERT((TempString == NULL && Size == 0) || (TempString != NULL));
@@ -3045 +3230 @@
     ) {
       FixCommand = AllocateZeroPool(StrSize(Command) - 4 * sizeof (CHAR16));
-      ASSERT(FixCommand != NULL);
-
-      StrnCpy(FixCommand, Command, StrLen(Command)-4);
+      if (FixCommand == NULL) {
+        return EFI_OUT_OF_RESOURCES;
+      }
+
+      StrnCpyS( FixCommand,
+                (StrSize(Command) - 4 * sizeof (CHAR16))/sizeof(CHAR16),
+                Command,
+                StrLen(Command)-4
+                );
       Status = ProcessManFile(FixCommand, FixCommand, Sections, NULL, HelpText);
       FreePool(FixCommand);
@@ -3101 +3292 @@
 **/
 CHAR16 *
-EFIAPI
 InternalEfiShellGetListAlias(
+  VOID
   )
 {
@@ -3215 +3406 @@
   EFI_STATUS  Status;
   CHAR16      *AliasLower;
+  CHAR16      *AliasVal;
 
   // Convert to lowercase to make aliases case-insensitive
   if (Alias != NULL) {
     AliasLower = AllocateCopyPool (StrSize (Alias), Alias);
-    ASSERT (AliasLower != NULL);
+    if (AliasLower == NULL) {
+      return NULL;
+    }
     ToLower (AliasLower);
 
     if (Volatile == NULL) {
-      return (AddBufferToFreeList(GetVariable(AliasLower, &gShellAliasGuid)));
+      GetVariable2 (AliasLower, &gShellAliasGuid, (VOID **)&AliasVal, NULL);
+      FreePool(AliasLower);
+      return (AddBufferToFreeList(AliasVal));
     }
     RetSize = 0;
@@ -3236 +3432 @@
         FreePool(RetVal);
       }
+      FreePool(AliasLower);
       return (NULL);
     }
@@ -3267 +3464 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalSetAlias(
   IN CONST CHAR16 *Command,
@@ -3276 +3472 @@
   EFI_STATUS  Status;
   CHAR16      *AliasLower;
-
+  BOOLEAN     DeleteAlias;
+
+  DeleteAlias = FALSE;
+  if (Alias == NULL) {
+    //
+    // We must be trying to remove one if Alias is NULL
+    // remove an alias (but passed in COMMAND parameter)
+    //
+    Alias       = Command;
+    DeleteAlias = TRUE;
+  }
+  ASSERT (Alias != NULL);
+
+  //
   // Convert to lowercase to make aliases case-insensitive
-  if (Alias != NULL) {
-    AliasLower = AllocateCopyPool (StrSize (Alias), Alias);
-    ASSERT (AliasLower != NULL);
-    ToLower (AliasLower);
+  //
+  AliasLower = AllocateCopyPool (StrSize (Alias), Alias);
+  if (AliasLower == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+  ToLower (AliasLower);
+
+  if (DeleteAlias) {
+    Status = gRT->SetVariable (AliasLower, &gShellAliasGuid, 0, 0, NULL);
   } else {
-    AliasLower = NULL;
-  }
-
-  //
-  // We must be trying to remove one if Alias is NULL
-  //
-  if (Alias == NULL) {
-    //
-    // remove an alias (but passed in COMMAND parameter)
-    //
-    Status = (gRT->SetVariable((CHAR16*)Command, &gShellAliasGuid, 0, 0, NULL));
-  } else {
-    //
-    // Add and replace are the same
-    //
-
-    // We dont check the error return on purpose since the variable may not exist.
-    gRT->SetVariable((CHAR16*)Command, &gShellAliasGuid, 0, 0, NULL);
-
-    Status = (gRT->SetVariable((CHAR16*)Alias, &gShellAliasGuid, EFI_VARIABLE_BOOTSERVICE_ACCESS|(Volatile?0:EFI_VARIABLE_NON_VOLATILE), StrSize(Command), (VOID*)Command));
-  }
-
-  if (Alias != NULL) {
-    FreePool (AliasLower);
-  }
+    Status = gRT->SetVariable (
+                    AliasLower, &gShellAliasGuid,
+                    EFI_VARIABLE_BOOTSERVICE_ACCESS | (Volatile ? 0 : EFI_VARIABLE_NON_VOLATILE),
+                    StrSize (Command), (VOID *) Command
+                    );
+  }
+
+  FreePool (AliasLower);
+
   return Status;
 }
@@ -3429 +3627 @@
 **/
 EFI_STATUS
-EFIAPI
 CreatePopulateInstallShellProtocol (
   IN OUT EFI_SHELL_PROTOCOL  **NewShell
@@ -3439 +3636 @@
   UINTN                       HandleCounter;
   SHELL_PROTOCOL_HANDLE_LIST  *OldProtocolNode;
+  EFI_SHELL_PROTOCOL          *OldShell;
 
   if (NewShell == NULL) {
@@ -3490 +3688 @@
     //
     for (HandleCounter = 0 ; HandleCounter < (BufferSize/sizeof(EFI_HANDLE)) ; HandleCounter++) {
-      OldProtocolNode = AllocateZeroPool(sizeof(SHELL_PROTOCOL_HANDLE_LIST));
-      ASSERT(OldProtocolNode != NULL);
       Status = gBS->OpenProtocol(Buffer[HandleCounter],
                                 &gEfiShellProtocolGuid,
-                                (VOID **) &(OldProtocolNode->Interface),
+                                (VOID **) &OldShell,
                                 gImageHandle,
                                 NULL,
@@ -3500 +3696 @@
                                );
       if (!EFI_ERROR(Status)) {
+        OldProtocolNode = AllocateZeroPool(sizeof(SHELL_PROTOCOL_HANDLE_LIST));
+        if (OldProtocolNode == NULL) {
+          if (!IsListEmpty (&ShellInfoObject.OldShellList.Link)) {
+            CleanUpShellProtocol (&mShellProtocol);
+          }
+          Status = EFI_OUT_OF_RESOURCES;
+          break;
+        }
         //
         // reinstall over the old one...
         //
-        OldProtocolNode->Handle = Buffer[HandleCounter];
+        OldProtocolNode->Handle    = Buffer[HandleCounter];
+        OldProtocolNode->Interface = OldShell;
         Status = gBS->ReinstallProtocolInterface(
                             OldProtocolNode->Handle,
@@ -3556 +3761 @@
 **/
 EFI_STATUS
-EFIAPI
 CleanUpShellProtocol (
   IN OUT EFI_SHELL_PROTOCOL  *NewShell
   )
 {
+  SHELL_PROTOCOL_HANDLE_LIST        *Node2;
+
+  //
+  // if we need to restore old protocols...
+  //
+  if (!IsListEmpty(&ShellInfoObject.OldShellList.Link)) {
+    for (Node2 = (SHELL_PROTOCOL_HANDLE_LIST *) GetFirstNode (&ShellInfoObject.OldShellList.Link)
+         ; !IsListEmpty (&ShellInfoObject.OldShellList.Link)
+         ; Node2 = (SHELL_PROTOCOL_HANDLE_LIST *) GetFirstNode (&ShellInfoObject.OldShellList.Link)
+         ) {
+      RemoveEntryList (&Node2->Link);
+      gBS->ReinstallProtocolInterface (Node2->Handle, &gEfiShellProtocolGuid, NewShell, Node2->Interface);
+      FreePool (Node2);
+    }
+  } else {
+    //
+    // no need to restore
+    //
+    gBS->UninstallProtocolInterface (gImageHandle, &gEfiShellProtocolGuid, NewShell);
+  }
+  return EFI_SUCCESS;
+}
+
+/**
+  Cleanup the shell environment.
+
+  @param[in, out] NewShell   The pointer to the new shell protocol structure.
+
+  @retval EFI_SUCCESS       The operation was successful.
+**/
+EFI_STATUS
+CleanUpShellEnvironment (
+  IN OUT EFI_SHELL_PROTOCOL  *NewShell
+  )
+{
   EFI_STATUS                        Status;
-  SHELL_PROTOCOL_HANDLE_LIST        *Node2;
   EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleEx;
 
-  //
-  // if we need to restore old protocols...
-  //
-  if (!IsListEmpty(&ShellInfoObject.OldShellList.Link)) {
-    for (Node2 = (SHELL_PROTOCOL_HANDLE_LIST *)GetFirstNode(&ShellInfoObject.OldShellList.Link)
-         ; !IsListEmpty (&ShellInfoObject.OldShellList.Link)
-         ; Node2 = (SHELL_PROTOCOL_HANDLE_LIST *)GetFirstNode(&ShellInfoObject.OldShellList.Link)
-        ){
-      RemoveEntryList(&Node2->Link);
-      Status = gBS->ReinstallProtocolInterface(Node2->Handle,
-                                               &gEfiShellProtocolGuid,
-                                               NewShell,
-                                               Node2->Interface);
-      FreePool(Node2);
-    }
-  } else {
-    //
-    // no need to restore
-    //
-    Status = gBS->UninstallProtocolInterface(gImageHandle,
-                                             &gEfiShellProtocolGuid,
-                                             NewShell);
-  }
+  CleanUpShellProtocol (NewShell);
+
   Status = gBS->CloseEvent(NewShell->ExecutionBreak);
   NewShell->ExecutionBreak = NULL;
@@ -3649 +3866 @@
 **/
 EFI_STATUS
-EFIAPI
 InernalEfiShellStartMonitor(
   VOID

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

@@ -3 +3 @@
   manipulation, and initialization of EFI_SHELL_PROTOCOL.
 
-  (C) Copyright 2014, Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -44 +44 @@
 **/
 EFI_STATUS
-EFIAPI
 CreatePopulateInstallShellProtocol (
   IN OUT EFI_SHELL_PROTOCOL  **NewShell
@@ -60 +59 @@
 **/
 EFI_STATUS
-EFIAPI
 CleanUpShellProtocol (
+  IN OUT EFI_SHELL_PROTOCOL  *NewShell
+  );
+
+/**
+  Cleanup the shell environment.
+
+  @param[in, out] NewShell   The pointer to the new shell protocol structure.
+
+  @retval EFI_SUCCESS       The operation was successful.
+**/
+EFI_STATUS
+CleanUpShellEnvironment (
   IN OUT EFI_SHELL_PROTOCOL  *NewShell
   );
@@ -284 +294 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalOpenFileDevicePath(
   IN OUT EFI_DEVICE_PATH_PROTOCOL *DevicePath2,
@@ -454 +463 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalShellExecuteDevicePath(
   IN CONST EFI_HANDLE               *ParentImageHandle,
@@ -512 +520 @@
 **/
 VOID
-EFIAPI
 FreeShellFileInfoNode(
   IN EFI_SHELL_FILE_INFO *FileListNode
@@ -563 +570 @@
 **/
 EFI_SHELL_FILE_INFO *
-EFIAPI
 CreateAndPopulateShellFileInfo(
   IN CONST CHAR16 *BasePath,
@@ -846 +852 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalSetAlias(
   IN CONST CHAR16 *Command,
@@ -891 +896 @@
 **/
 VOID
-EFIAPI
 InternalFreeShellFileInfoNode(
   IN EFI_SHELL_FILE_INFO *FileListNode
@@ -907 +911 @@
 **/
 EFI_STATUS
-EFIAPI
 InternalEfiShellSetEnv(
   IN CONST CHAR16 *Name,
@@ -922 +925 @@
 **/
 EFI_STATUS
-EFIAPI
 InernalEfiShellStartMonitor(
   VOID

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c

@@ -3 +3 @@
   for a shell application.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -41 +41 @@
 {
   UINTN  Index;
-
-  Print(L"ShellCTestApp.c:ShellAppMain called with %d parameters\n", Argc);
-  for (Index = 0; Index < Argc; Index++) {
-    Print(L"Argv[%d]: %s\n", Index, Argv[Index]);
+  if (Argc == 1) {
+    Print (L"Argv[1] = NULL\n");
+  }
+  for (Index = 1; Index < Argc; Index++) {
+    Print(L"Argv[%d]: \"%s\"\n", Index, Argv[Index]);
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf

@@ -2 +2 @@
 #  This is the shell sorting testing application
 #
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -34 +34 @@
   MdePkg/MdePkg.dec
   ShellPkg/ShellPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]