[PATCH 0/3] CapsuleApp: Some enhancements

[PATCH 0/3] CapsuleApp: Some enhancements

[Star Zeng]

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>

Star Zeng (3):
  MdeModulePkg CapsuleApp: Check Arg count for -D option
  MdeModulePkg CapsuleApp: Refine -D option help information
  MdeModulePkg CapsuleApp: Fix typo EFI_CAPSULE_RPORT_GUID

 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

-- 
2.7.0.windows.1

[PATCH 1/3] MdeModulePkg CapsuleApp: Check Arg count for -D option

[Star Zeng]

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 3a1a0a1cb2e6..90f1a02d9af6 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -792,6 +792,10 @@ UefiMain (
     return EFI_INVALID_PARAMETER;
   }
   if (StrCmp(Argv[1], L"-D") == 0) {
+    if (Argc < 3) {
+      Print(L"CapsuleApp: NO input capsule name.\n");
+      return EFI_INVALID_PARAMETER;
+    }
     Status = DumpCapsule(Argv[2]);
     return Status;
   }
-- 
2.7.0.windows.1

[PATCH 2/3] MdeModulePkg CapsuleApp: Refine -D option help information

[Star Zeng]

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 90f1a02d9af6..27a38667797a 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -747,8 +747,8 @@ PrintUsage (
   Print(L"  -N:  Append a Capsule Header to an existing capsule image,\n");
   Print(L"       according to Windows Firmware Update document\n");
   Print(L"  -O:  Output new Capsule file name\n");
-  Print(L"  -D:  Dump Capsule image header information and FMP header information,\n");
-  Print(L"       if it is an FMP capsule.\n");
+  Print(L"  -D:  Dump Capsule image header information, image payload information if it is UX capsule\n");
+  Print(L"       and FMP header information if it is a FMP capsule.\n");
 }
 
 /**
-- 
2.7.0.windows.1

[PATCH 3/3] MdeModulePkg CapsuleApp: Fix typo EFI_CAPSULE_RPORT_GUID

[Star Zeng]

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 27a38667797a..bc727279c5b0 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -738,7 +738,7 @@ PrintUsage (
   Print(L"       with CAPSULE_FLAGS_PERSIST_ACROSS_RESET and without CAPSULE_FLAGS_INITIATE_RESET.\n");
   Print(L"  -S:  Dump capsule report variable (EFI_CAPSULE_REPORT_GUID),\n");
   Print(L"       which is defined in UEFI specification.\n");
-  Print(L"  -C:  Clear capsule report variable (EFI_CAPSULE_RPORT_GUID),\n");
+  Print(L"  -C:  Clear capsule report variable (EFI_CAPSULE_REPORT_GUID),\n");
   Print(L"       which is defined in UEFI specification.\n");
   Print(L"  -P:  Dump UEFI FMP protocol info.\n");
   Print(L"  -E:  Dump UEFI ESRT table info.\n");
-- 
2.7.0.windows.1

Re: [PATCH 0/3] CapsuleApp: Some enhancements

[Yao, Jiewen]

Series reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Wednesday, July 11, 2018 11:51 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Zhu,
> Yonghong <yonghong.zhu@intel.com>
> Subject: [PATCH 0/3] CapsuleApp: Some enhancements
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> 
> Star Zeng (3):
>   MdeModulePkg CapsuleApp: Check Arg count for -D option
>   MdeModulePkg CapsuleApp: Refine -D option help information
>   MdeModulePkg CapsuleApp: Fix typo EFI_CAPSULE_RPORT_GUID
> 
>  MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> --
> 2.7.0.windows.1