tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: Use a local variable to cache the pointer. 

CC: Qiu Shumin <shumin.qiu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
This commit is contained in:
Jaben Carsey 2016-05-11 08:09:34 -07:00
parent cf1d454983
commit 0822201906
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ShellPkg/Application/Shell/Shell.c
View File

@ -2499,6 +2499,7 @@ SetupAndRunCommandOrFile(
SHELL_FILE_HANDLE OriginalStdOut; SHELL_FILE_HANDLE OriginalStdOut;
SHELL_FILE_HANDLE OriginalStdErr; SHELL_FILE_HANDLE OriginalStdErr;
SYSTEM_TABLE_INFO OriginalSystemTableInfo; SYSTEM_TABLE_INFO OriginalSystemTableInfo;
CONST SCRIPT_FILE *ConstScriptFile;
// //
// Update the StdIn, StdOut, and StdErr for redirection to environment variables, files, etc... unicode and ASCII // Update the StdIn, StdOut, and StdErr for redirection to environment variables, files, etc... unicode and ASCII
@ -2518,10 +2519,11 @@ SetupAndRunCommandOrFile(
// Now print errors // Now print errors
// //
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
if (ShellCommandGetCurrentScriptFile() == NULL || ShellCommandGetCurrentScriptFile()->CurrentCommand == NULL) { ConstScriptFile = ShellCommandGetCurrentScriptFile();
if (ConstScriptFile == NULL || ConstScriptFile->CurrentCommand == NULL) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR), ShellInfoObject.HiiHandle, (VOID*)(Status)); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR), ShellInfoObject.HiiHandle, (VOID*)(Status));
} else { } else {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR_SCRIPT), ShellInfoObject.HiiHandle, (VOID*)(Status), ShellCommandGetCurrentScriptFile()->CurrentCommand->Line); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR_SCRIPT), ShellInfoObject.HiiHandle, (VOID*)(Status), ConstScriptFile->CurrentCommand->Line);
} }
} }