commit 9d54bf4e7ef13fc0d8ccb954d106fc6ff29dd8ea
author Tapan Shah <tapandshah@hpe.com> Mon Oct 24 09:56:37 2016 -0700
committer Jaben Carsey <jaben.carsey@intel.com> Mon Oct 24 10:27:08 2016 -0700
tree a067db3a514ad639bd256bb98e6857ffbe77c490
parent 60d9f5f43bbb7e0a859c1f744a20cee88af9c863

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

'-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>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

ShellPkg/Library/UefiShellLevel3CommandsLib/Ver.c

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 @@
       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,