[PATCH] ShellPkg: Add Shell invocation option '-exit'

[PATCH] ShellPkg: Add Shell invocation option '-exit'

[Ruiyu Ni]

From: Chen A Chen <chen.a.chen@intel.com>

According to Shell spec 2.2 '-exit' invocation option is used to specify
that after running the command line when launched, the UEFI Shell must
immediately exit.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
---
 ShellPkg/Application/Shell/Shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 350d7ff..dfcbfb8 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -1022,7 +1022,7 @@ ProcessCommandLine(
       }
     } else if (UnicodeCollation->StriColl (
                                    UnicodeCollation,
-                                   L"-_exit",
+                                   L"-exit",
                                    CurrentArg
                                    ) == 0) {
       ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit         = TRUE;
-- 
2.9.0.windows.1

Re: [PATCH] ShellPkg: Add Shell invocation option '-exit'

[Carsey, Jaben]

I think we also need to modify one other location (I did a search for -_exit and didn't see any more):

\shellpkg\Application\Shell\ShellProtocol.c
Line 1784:     StrnCatGrow(&Temp, &Size, L"Shell.efi -_exit ", 0);

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Wednesday, March 22, 2017 1:09 AM
> To: edk2-devel@lists.01.org
> Cc: Chen, Chen A <chen.a.chen@intel.com>; Carsey, Jaben
> <jaben.carsey@intel.com>
> Subject: [PATCH] ShellPkg: Add Shell invocation option '-exit'
> Importance: High
> 
> From: Chen A Chen <chen.a.chen@intel.com>
> 
> According to Shell spec 2.2 '-exit' invocation option is used to specify
> that after running the command line when launched, the UEFI Shell must
> immediately exit.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
>  ShellPkg/Application/Shell/Shell.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ShellPkg/Application/Shell/Shell.c
> b/ShellPkg/Application/Shell/Shell.c
> index 350d7ff..dfcbfb8 100644
> --- a/ShellPkg/Application/Shell/Shell.c
> +++ b/ShellPkg/Application/Shell/Shell.c
> @@ -1022,7 +1022,7 @@ ProcessCommandLine(
>        }
>      } else if (UnicodeCollation->StriColl (
>                                     UnicodeCollation,
> -                                   L"-_exit",
> +                                   L"-exit",
>                                     CurrentArg
>                                     ) == 0) {
>        ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit         = TRUE;
> --
> 2.9.0.windows.1

Re: [PATCH] ShellPkg: Add Shell invocation option '-exit'

[Carsey, Jaben]

So based on the other discussion about the Shell GUID and a bit of thinking, I realized this is non backwards compatible.  We should spin GUID for Shell (and ShellBin compiled versions when compiled next)...

I guess we get to do a real test of the removal of hard coded shell GUIDs in Ard's most recent patch series.

-Jaben

> -----Original Message-----
> From: Carsey, Jaben
> Sent: Wednesday, March 22, 2017 8:19 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Cc: Chen, Chen A <chen.a.chen@intel.com>; Carsey, Jaben
> <jaben.carsey@intel.com>
> Subject: RE: [PATCH] ShellPkg: Add Shell invocation option '-exit'
> 
> I think we also need to modify one other location (I did a search for -_exit
> and didn't see any more):
> 
> \shellpkg\Application\Shell\ShellProtocol.c
> Line 1784:     StrnCatGrow(&Temp, &Size, L"Shell.efi -_exit ", 0);
> 
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Wednesday, March 22, 2017 1:09 AM
> > To: edk2-devel@lists.01.org
> > Cc: Chen, Chen A <chen.a.chen@intel.com>; Carsey, Jaben
> > <jaben.carsey@intel.com>
> > Subject: [PATCH] ShellPkg: Add Shell invocation option '-exit'
> > Importance: High
> >
> > From: Chen A Chen <chen.a.chen@intel.com>
> >
> > According to Shell spec 2.2 '-exit' invocation option is used to specify
> > that after running the command line when launched, the UEFI Shell must
> > immediately exit.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > ---
> >  ShellPkg/Application/Shell/Shell.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/ShellPkg/Application/Shell/Shell.c
> > b/ShellPkg/Application/Shell/Shell.c
> > index 350d7ff..dfcbfb8 100644
> > --- a/ShellPkg/Application/Shell/Shell.c
> > +++ b/ShellPkg/Application/Shell/Shell.c
> > @@ -1022,7 +1022,7 @@ ProcessCommandLine(
> >        }
> >      } else if (UnicodeCollation->StriColl (
> >                                     UnicodeCollation,
> > -                                   L"-_exit",
> > +                                   L"-exit",
> >                                     CurrentArg
> >                                     ) == 0) {
> >        ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit         = TRUE;
> > --
> > 2.9.0.windows.1