[PATCH] ShellPkg: handle '-t or -terse' and '-s' flags for 'ver' command properly

[PATCH] ShellPkg: handle '-t or -terse' and '-s' flags for 'ver' command properly

[Tapan Shah]

'-t or -terse' and '-s' flags are multiple exclusive
So when both flags are used together, command should report an error message.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hpe.com>
---
 ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
index deefaf0..d0e2b5c 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
@@ -1,6 +1,7 @@
 /** @file
   Main file for Ver shell level 3 function.
 
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
@@ -84,15 +85,20 @@ ShellCommandRunVer (
       ShellStatus = SHELL_INVALID_PARAMETER;
     } else {
       if (ShellCommandLineGetFlag(Package, L"-s")) {
-        ShellPrintHiiEx (
-          0,
-          gST->ConOut->Mode->CursorRow,
-          NULL,
-          STRING_TOKEN (STR_VER_OUTPUT_SIMPLE),
-          gShellLevel3HiiHandle,
-          gEfiShellProtocol->MajorVersion,
-          gEfiShellProtocol->MinorVersion
-         );
+        if (ShellCommandLineGetFlag(Package, L"-terse") || ShellCommandLineGetFlag(Package, L"-t")){
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellLevel3HiiHandle, L"ver", L"-t or -terse", L"-s");
+          ShellStatus = SHELL_INVALID_PARAMETER;
+        } else {
+          ShellPrintHiiEx (
+            0,
+            gST->ConOut->Mode->CursorRow,
+            NULL,
+            STRING_TOKEN (STR_VER_OUTPUT_SIMPLE),
+            gShellLevel3HiiHandle,
+            gEfiShellProtocol->MajorVersion,
+            gEfiShellProtocol->MinorVersion
+           );
+        }
       } else {
         ShellPrintHiiEx (
           0,
-- 
1.9.5.msysgit.0

Re: [PATCH] ShellPkg: handle '-t or -terse' and '-s' flags for 'ver' command properly

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
And pushed.

> -----Original Message-----
> From: Tapan Shah [mailto:tapandshah@hpe.com]
> Sent: Monday, October 24, 2016 9:57 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Tapan Shah
> <tapandshah@hpe.com>
> Subject: [PATCH] ShellPkg: handle '-t or -terse' and '-s' flags for 'ver'
> command properly
> Importance: High
> 
> '-t or -terse' and '-s' flags are multiple exclusive
> So when both flags are used together, command should report an error
> message.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Tapan Shah <tapandshah@hpe.com>
> ---
>  ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c | 24
> ++++++++++++++---------
>  1 file changed, 15 insertions(+), 9 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
> b/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
> index deefaf0..d0e2b5c 100644
> --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
> +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c
> @@ -1,6 +1,7 @@
>  /** @file
>    Main file for Ver shell level 3 function.
> 
> +  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>    (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
>    Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
>    This program and the accompanying materials
> @@ -84,15 +85,20 @@ ShellCommandRunVer (
>        ShellStatus = SHELL_INVALID_PARAMETER;
>      } else {
>        if (ShellCommandLineGetFlag(Package, L"-s")) {
> -        ShellPrintHiiEx (
> -          0,
> -          gST->ConOut->Mode->CursorRow,
> -          NULL,
> -          STRING_TOKEN (STR_VER_OUTPUT_SIMPLE),
> -          gShellLevel3HiiHandle,
> -          gEfiShellProtocol->MajorVersion,
> -          gEfiShellProtocol->MinorVersion
> -         );
> +        if (ShellCommandLineGetFlag(Package, L"-terse") ||
> ShellCommandLineGetFlag(Package, L"-t")){
> +          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN
> (STR_GEN_PARAM_CONFLICT), gShellLevel3HiiHandle, L"ver", L"-t or -terse",
> L"-s");
> +          ShellStatus = SHELL_INVALID_PARAMETER;
> +        } else {
> +          ShellPrintHiiEx (
> +            0,
> +            gST->ConOut->Mode->CursorRow,
> +            NULL,
> +            STRING_TOKEN (STR_VER_OUTPUT_SIMPLE),
> +            gShellLevel3HiiHandle,
> +            gEfiShellProtocol->MajorVersion,
> +            gEfiShellProtocol->MinorVersion
> +           );
> +        }
>        } else {
>          ShellPrintHiiEx (
>            0,
> --
> 1.9.5.msysgit.0