From a308e0588b3ad87b94611391e9e7a04a8eb05ebf Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Thu, 18 Sep 2014 01:58:03 +0000 Subject: Roll back check in r15180 which caused the shell always returns EFI_ABORTED no matter what exit-code is specified for "exit" command. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Reviewed-by: Carsey Jaben git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16127 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Application/Shell/Shell.h | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'ShellPkg/Application/Shell/Shell.h') diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h index 57518dfd29..c20ee3a803 100644 --- a/ShellPkg/Application/Shell/Shell.h +++ b/ShellPkg/Application/Shell/Shell.h @@ -231,17 +231,14 @@ ProcessCommandLine( @param[in] ImagePath The path to the image for shell. The first place to look for the startup script. @param[in] FilePath The path to the file for shell. The second place to look for the startup script. - @param[out] ExitStatus The exit code of the script. Ignored if NULL. - Invalid when this function returns an error. @retval EFI_SUCCESS The variable is initialized. **/ EFI_STATUS EFIAPI DoStartupScript( - IN EFI_DEVICE_PATH_PROTOCOL *ImagePath, - IN EFI_DEVICE_PATH_PROTOCOL *FilePath, - OUT SHELL_STATUS *ExitStatus + IN EFI_DEVICE_PATH_PROTOCOL *ImagePath, + IN EFI_DEVICE_PATH_PROTOCOL *FilePath ); /** @@ -286,8 +283,7 @@ AddLineToCommandHistory( This will determine if the command line represents an internal shell command or dispatch an external application. - @param[in] CmdLine the command line to parse - @param[out] ExitStatus The exit status of the command. Ignored if NULL. + @param[in] CmdLine the command line to parse @retval EFI_SUCCESS the command was completed @retval EFI_ABORTED the command's operation was aborted @@ -295,8 +291,7 @@ AddLineToCommandHistory( EFI_STATUS EFIAPI RunCommand( - IN CONST CHAR16 *CmdLine, - OUT SHELL_STATUS *ExitStatus + IN CONST CHAR16 *CmdLine ); /** @@ -320,17 +315,13 @@ IsValidCommandName( @param[in] Handle The handle to the already opened file. @param[in] Name The name of the script file. - @param[out] ExitStatus The exit code of the script. Ignored if NULL. - Invalid when this function returns an error. - @retval EFI_SUCCESS the script completed sucessfully **/ EFI_STATUS EFIAPI RunScriptFileHandle ( - IN SHELL_FILE_HANDLE Handle, - IN CONST CHAR16 *Name, - OUT SHELL_STATUS *ExitStatus + IN SHELL_FILE_HANDLE Handle, + IN CONST CHAR16 *Name ); /** @@ -341,20 +332,17 @@ RunScriptFileHandle ( @param[in] CmdLine the command line to run. @param[in] ParamProtocol the shell parameters protocol pointer - @param[out] ExitStatus The exit code of the script. Ignored if NULL. - Invalid when this function returns an error. - @retval EFI_SUCCESS the script completed sucessfully **/ EFI_STATUS EFIAPI RunScriptFile ( - IN CONST CHAR16 *ScriptPath, - IN SHELL_FILE_HANDLE Handle OPTIONAL, - IN CONST CHAR16 *CmdLine, - IN EFI_SHELL_PARAMETERS_PROTOCOL *ParamProtocol, - OUT SHELL_STATUS *ExitStatus + IN CONST CHAR16 *ScriptPath, + IN SHELL_FILE_HANDLE Handle OPTIONAL, + IN CONST CHAR16 *CmdLine, + IN EFI_SHELL_PARAMETERS_PROTOCOL *ParamProtocol ); + #endif //_SHELL_INTERNAL_HEADER_ -- cgit v1.2.3