From 284e034f4f43530e85b38c74322772e669f561d6 Mon Sep 17 00:00:00 2001
From: Chris Phillips <chrisp@hp.com>
Date: Fri, 18 Oct 2013 15:49:23 +0000
Subject: =?UTF-8?q?ShellPkg:=20Fixes=20for=20shell=20application=20launch,?=
 =?UTF-8?q?=20argument=20handling,=20and=20version=20output:=20-=20Fixes?=
 =?UTF-8?q?=20shell=20application=20launch=20version=20output=20to=20match?=
 =?UTF-8?q?=20=E2=80=98ver=E2=80=99=20command,=20as=20specified=20by=20the?=
 =?UTF-8?q?=20UEFI=20Shell=20spec.=20-=20Adds=20PcdShellSupplier=20for=20<?=
 =?UTF-8?q?shell-supplier-specific-data>=20line=20of=20version=20output.?=
 =?UTF-8?q?=20=20Defaulted=20to=20=E2=80=9CEDK=20II=E2=80=9D.=20-=20Displa?=
 =?UTF-8?q?y=20only=201=20startup.nsh=20countdown=20line=20per=20second=20?=
 =?UTF-8?q?instead=20of=2010=20per=20second.=20-=20Fix=20issue=20where=20c?=
 =?UTF-8?q?ommand=20line=20is=20just=201=20or=20more=20=E2=80=9C=20?=
 =?UTF-8?q?=E2=80=9C=20characters=20and=20displayed=20garbage.=20-=20Fix?=
 =?UTF-8?q?=20for=20@echo=20=E2=80=93off=20and=20@echo=20=E2=80=93on=20to?=
 =?UTF-8?q?=20not=20restore=20echo=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 .../UefiShellLevel3CommandsLib.inf                  |   2 ++
 .../UefiShellLevel3CommandsLib.uni                  | Bin 42726 -> 42738 bytes
 ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c   |   6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'ShellPkg/Library/UefiShellLevel3CommandsLib')

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
Binary files a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni and b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni differ
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)
            );
 
 
-- 
cgit v1.2.3