Skip to content

Commit

Permalink
ShellPkg: Increase PcdShellPrintBufferSize from UINT16 to UINT32
Browse files Browse the repository at this point in the history 
Increase max buffer size to support more than 64K.

Signed-off-by: Giri Mudusuru <girim@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Andrew Fish <afish@apple.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
  • Loading branch information
@Girim123a @mergify
Girim123a authored and mergify[bot] committed Oct 17, 2023
1 parent 03d6569 commit a445e1a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
5 changes: 3 additions & 2 deletions ShellPkg/Application/Shell/Shell.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
Copyright 2015-2018 Dell Technologies.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
Copyright (C) 2023, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/

#include "Shell.h"
Expand Down Expand Up @@ -2944,7 +2945,7 @@ RunScriptFileHandle (
ASSERT (!ShellCommandGetScriptExit ());

PreScriptEchoState = ShellCommandGetEchoState ();
PrintBuffSize = PcdGet16 (PcdShellPrintBufferSize);
PrintBuffSize = PcdGet32 (PcdShellPrintBufferSize);

NewScriptFile = (SCRIPT_FILE *)AllocateZeroPool (sizeof (SCRIPT_FILE));
if (NewScriptFile == NULL) {
Expand Down
19 changes: 10 additions & 9 deletions ShellPkg/Library/UefiShellLib/UefiShellLib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
Copyright 2016-2018 Dell Technologies.<BR>
Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
Copyright (C) 2023, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/

#include "UefiShellLib.h"
Expand Down Expand Up @@ -2952,8 +2953,8 @@ InternalShellPrintWorker (
CHAR16 *mPostReplaceFormat;
CHAR16 *mPostReplaceFormat2;

mPostReplaceFormat = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
mPostReplaceFormat2 = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
mPostReplaceFormat = AllocateZeroPool (PcdGet32 (PcdShellPrintBufferSize));
mPostReplaceFormat2 = AllocateZeroPool (PcdGet32 (PcdShellPrintBufferSize));

if ((mPostReplaceFormat == NULL) || (mPostReplaceFormat2 == NULL)) {
SHELL_FREE_NON_NULL (mPostReplaceFormat);
Expand All @@ -2967,21 +2968,21 @@ InternalShellPrintWorker (
//
// Back and forth each time fixing up 1 of our flags...
//
Status = ShellCopySearchAndReplace (Format, mPostReplaceFormat, PcdGet16 (PcdShellPrintBufferSize), L"%N", L"%%N", FALSE, FALSE);
Status = ShellCopySearchAndReplace (Format, mPostReplaceFormat, PcdGet32 (PcdShellPrintBufferSize), L"%N", L"%%N", FALSE, FALSE);
ASSERT_EFI_ERROR (Status);
Status = ShellCopySearchAndReplace (mPostReplaceFormat, mPostReplaceFormat2, PcdGet16 (PcdShellPrintBufferSize), L"%E", L"%%E", FALSE, FALSE);
Status = ShellCopySearchAndReplace (mPostReplaceFormat, mPostReplaceFormat2, PcdGet32 (PcdShellPrintBufferSize), L"%E", L"%%E", FALSE, FALSE);
ASSERT_EFI_ERROR (Status);
Status = ShellCopySearchAndReplace (mPostReplaceFormat2, mPostReplaceFormat, PcdGet16 (PcdShellPrintBufferSize), L"%H", L"%%H", FALSE, FALSE);
Status = ShellCopySearchAndReplace (mPostReplaceFormat2, mPostReplaceFormat, PcdGet32 (PcdShellPrintBufferSize), L"%H", L"%%H", FALSE, FALSE);
ASSERT_EFI_ERROR (Status);
Status = ShellCopySearchAndReplace (mPostReplaceFormat, mPostReplaceFormat2, PcdGet16 (PcdShellPrintBufferSize), L"%B", L"%%B", FALSE, FALSE);
Status = ShellCopySearchAndReplace (mPostReplaceFormat, mPostReplaceFormat2, PcdGet32 (PcdShellPrintBufferSize), L"%B", L"%%B", FALSE, FALSE);
ASSERT_EFI_ERROR (Status);
Status = ShellCopySearchAndReplace (mPostReplaceFormat2, mPostReplaceFormat, PcdGet16 (PcdShellPrintBufferSize), L"%V", L"%%V", FALSE, FALSE);
Status = ShellCopySearchAndReplace (mPostReplaceFormat2, mPostReplaceFormat, PcdGet32 (PcdShellPrintBufferSize), L"%V", L"%%V", FALSE, FALSE);
ASSERT_EFI_ERROR (Status);

//
// Use the last buffer from replacing to print from...
//
UnicodeVSPrint (mPostReplaceFormat2, PcdGet16 (PcdShellPrintBufferSize), mPostReplaceFormat, Marker);
UnicodeVSPrint (mPostReplaceFormat2, PcdGet32 (PcdShellPrintBufferSize), mPostReplaceFormat, Marker);

if ((Col != -1) && (Row != -1)) {
Status = gST->ConOut->SetCursorPosition (gST->ConOut, Col, Row);
Expand Down
4 changes: 2 additions & 2 deletions ShellPkg/ShellPkg.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2016 - 2018, ARM Limited. All rights reserved.<BR>
# Copyright (C) 2023, Apple Inc. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##

[Defines]
Expand Down Expand Up @@ -84,7 +84,7 @@
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|TRUE|BOOLEAN|0x00000005

## This is the max buffer for ShellLib and internal Shell printings.
gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize|16000|UINT16|0x0000000C
gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize|16000|UINT32|0x0000000C

## This flag is used to control the commands available in the shell
gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel|3|UINT8|0x00000001
Expand Down

0 comments on commit a445e1a

Please sign in to comment.