ShellPkg: Fixes for shell application launch, argument handling, and version output:

- Fixes shell application launch version output to match ‘ver’ command, as specified by the UEFI Shell spec.
- Adds PcdShellSupplier for <shell-supplier-specific-data> line of version output.  Defaulted to “EDK II”.
- Display only 1 startup.nsh countdown line per second instead of 10 per second.
- Fix issue where command line is just 1 or more “ “ characters and displayed garbage.
- Fix for @echo –off and @echo –on to not restore echo state

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Phillips <chrisp@hp.com>
reviewed-by: Jaben Carsey <Jaben.Carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14784 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 6 insertions, 2 deletions

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
index 936476d0d5..7316750fd8 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
@@ -2,6 +2,7 @@
 # Provides shell level 3 functions

 # Note that the interactive versions of the time, date, and timezone functions are handled in the level 2 library.

 #

+# Copyright (c) 2013, Hewlett-Packard Development Company, L.P.

 # Copyright (c) 2009-2011, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

@@ -66,4 +67,5 @@
 [Pcd.common]

   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel

   gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier

 

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni
index 8c3e79dda7..1a52329917 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
index e00f4c90f5..765a6a3aba 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for Ver shell level 3 function.

 

+  Copyright (c) 2013, Hewlett-Packard Development Company, L.P.

   Copyright (c) 2009 - 2010, 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

@@ -108,8 +109,9 @@ ShellCommandRunVer (
             -1,

             -1,

             NULL,

-            STRING_TOKEN (STR_VER_EXTRA_STRING),

-            gShellLevel3HiiHandle

+            STRING_TOKEN (STR_VER_OUTPUT_SUPPLIER),

+            gShellLevel3HiiHandle,

+            (CHAR16 *) PcdGetPtr (PcdShellSupplier)

            );