sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: make automatically created shells quit automatically

Browse Source 
This creates a new parameter to this shell implementation “_exit” that causes the shell to automatically exit after running the initial specified command line.  This also automatically uses that command in the Execute() API.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: jaben carsey <jaben.carsey@intel.com>
Reviewed-by: Samer El-Haj-Mahmoud <elhaj@hp.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14444 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jaben carsey
2013-06-27 16:11:39 +00:00
committed by jcarsey
parent 4986bbaf11
commit ca79c79821
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/** @file /** @file
This is THE shell (application) This is THE shell (application)
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -381,7 +381,7 @@ UefiMain (
Status = DoStartupScript(ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath); Status = DoStartupScript(ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath);
} }
if (!ShellCommandGetExit() && (PcdGet8(PcdShellSupportLevel) >= 3 || PcdGetBool(PcdShellForceConsole)) && !EFI_ERROR(Status) && !ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoConsoleIn) { if (!ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit && !ShellCommandGetExit() && (PcdGet8(PcdShellSupportLevel) >= 3 || PcdGetBool(PcdShellForceConsole)) && !EFI_ERROR(Status) && !ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoConsoleIn) {
// //
// begin the UI waiting loop // begin the UI waiting loop
// //
@ -642,6 +642,7 @@ STATIC CONST SHELL_PARAM_ITEM mShellParamList[] = {
{L"-noversion", TypeFlag}, {L"-noversion", TypeFlag},
{L"-startup", TypeFlag}, {L"-startup", TypeFlag},
{L"-delay", TypeValue}, {L"-delay", TypeValue},
{L"-_exit", TypeFlag},
{NULL, TypeMax} {NULL, TypeMax}
}; };
@ -749,6 +750,7 @@ ProcessCommandLine(
ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoMap = ShellCommandLineGetFlag(Package, L"-nomap"); ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoMap = ShellCommandLineGetFlag(Package, L"-nomap");
ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoVersion = ShellCommandLineGetFlag(Package, L"-noversion"); ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoVersion = ShellCommandLineGetFlag(Package, L"-noversion");
ShellInfoObject.ShellInitSettings.BitUnion.Bits.Delay = ShellCommandLineGetFlag(Package, L"-delay"); ShellInfoObject.ShellInitSettings.BitUnion.Bits.Delay = ShellCommandLineGetFlag(Package, L"-delay");
ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit = ShellCommandLineGetFlag(Package, L"-_exit");
ShellInfoObject.ShellInitSettings.Delay = 5; ShellInfoObject.ShellInitSettings.Delay = 5;

5
ShellPkg/Application/Shell/Shell.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
function definitions for internal to shell functions. function definitions for internal to shell functions.
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -71,7 +71,8 @@ typedef struct {
UINT32 NoMap:1; ///< Was "-nomap" found on command line. UINT32 NoMap:1; ///< Was "-nomap" found on command line.
UINT32 NoVersion:1; ///< Was "-noversion" found on command line. UINT32 NoVersion:1; ///< Was "-noversion" found on command line.
UINT32 Delay:1; ///< Was "-delay[:n] found on command line UINT32 Delay:1; ///< Was "-delay[:n] found on command line
UINT32 Reserved:8; ///< Extra bits UINT32 Exit:1; ///< Was "-_exit" found on command line
UINT32 Reserved:7; ///< Extra bits
} SHELL_BITS; } SHELL_BITS;
typedef union { typedef union {

4
ShellPkg/Application/Shell/ShellProtocol.c
View File

@ -2,7 +2,7 @@
Member functions of EFI_SHELL_PROTOCOL and functions for creation, Member functions of EFI_SHELL_PROTOCOL and functions for creation,
manipulation, and initialization of EFI_SHELL_PROTOCOL. manipulation, and initialization of EFI_SHELL_PROTOCOL.
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1594,7 +1594,7 @@ EfiShellExecute(
Temp = NULL; Temp = NULL;
Size = 0; Size = 0;
ASSERT((Temp == NULL && Size == 0) || (Temp != NULL)); ASSERT((Temp == NULL && Size == 0) || (Temp != NULL));
StrnCatGrow(&Temp, &Size, L"Shell.efi ", 0); StrnCatGrow(&Temp, &Size, L"Shell.efi -_exit ", 0);
StrnCatGrow(&Temp, &Size, CommandLine, 0); StrnCatGrow(&Temp, &Size, CommandLine, 0);
Status = InternalShellExecuteDevicePath( Status = InternalShellExecuteDevicePath(