summaryrefslogtreecommitdiff
path: root/ShellPkg
diff options
context:
space:
mode:
authorjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>2012-01-30 18:44:41 +0000
committerjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>2012-01-30 18:44:41 +0000
commit8bb7441edd2d41b03af0666367ce0bc7a78080a5 (patch)
tree811046f2a49271c528480c861506694ba8f05718 /ShellPkg
parent479f85bb721765fefc43bb98bff999e2b3bc779a (diff)
downloadedk2-platforms-8bb7441edd2d41b03af0666367ce0bc7a78080a5.tar.xz
ShellPkg: Allow for format character strings to be typed in editor without having effect on editor screen.
signed-off-by: jcarsey reviewed-by: leegrosenbaum git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12965 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c6
-rw-r--r--ShellPkg/Library/UefiShellLib/UefiShellLib.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
index 7d82884326..ff1d000aeb 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
@@ -1,7 +1,7 @@
/** @file
Implements filebuffer interface functions.
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2005 - 2012, 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
which accompanies this distribution. The full text of the license may be found at
@@ -489,6 +489,7 @@ FileBufferPrintLine (
CHAR16 *Buffer;
UINTN Limit;
CHAR16 PrintLine[200];
+ CHAR16 PrintLine2[250];
//
// print start from correct character
@@ -506,12 +507,13 @@ FileBufferPrintLine (
}
PrintLine[MainEditor.ScreenSize.Column] = CHAR_NULL;
+ ShellCopySearchAndReplace(PrintLine, PrintLine2, 250, L"%", L"^%", FALSE, FALSE);
ShellPrintEx (
0,
(INT32)Row - 1,
L"%s",
- PrintLine
+ PrintLine2
);
return EFI_SUCCESS;
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index aabd9140df..85a5d44f08 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -2721,6 +2721,11 @@ InternalShellPrintWorker(
if (ResumeLocation != NULL) {
if (*(ResumeLocation-1) == L'^') {
//
+ // Move cursor back 1 position to overwrite the ^
+ //
+ gST->ConOut->SetCursorPosition(gST->ConOut, gST->ConOut->Mode->CursorColumn - 1, gST->ConOut->Mode->CursorRow);
+
+ //
// Print a simple '%' symbol
//
Status = InternalPrintTo(L"%");