BootSectImage.exe, EfiLdrImage.exe and Split.exe tools have incorrect output from...

This patch fixes the --version option output and corrects the description displayed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lhauch <larry.hauch@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15890 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/BootSectImage/bootsectimage.c b/BaseTools/Source/C/BootSectImage/bootsectimage.c
index fd367c28b36d100995d762cb3515b51c60ed7144..b4fb340c2bb70decbb3db53e28a3d86906e857b9 100644 (file)
--- a/BaseTools/Source/C/BootSectImage/bootsectimage.c
+++ b/BaseTools/Source/C/BootSectImage/bootsectimage.c
@@ -56,8 +56,10 @@ Returns:
 \r
 --*/\r
 {\r
-  printf ("%s v%d.%d %s - Utility to break a file into two pieces at the specified offset.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
-  printf ("Copyright (c) 1999-2010 Intel Corporation. All rights reserved.\n");\r
+  printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
+  printf ("Copyright (c) 1999-2014 Intel Corporation. All rights reserved.\n");\r
+  printf ("\n  The BootSectImage tool prints information or patch destination file by source\n");\r
+  printf ("  file for BIOS Parameter Block (BPB) or Master Boot Record (MBR).\n");\r
 }\r
 \r
 void\r
@@ -889,6 +891,9 @@ main (
       ProcessMbr = TRUE;\r
     } else if (strcmp (*argv, "-v") == 0 || strcmp (*argv, "--verbose") == 0) {\r
       Verbose    = TRUE;\r
+    } else if (strcmp (*argv, "--version") == 0) {\r
+      Version();\r
+      return 0;\r
     } else if ((stricmp (*argv, "-d") == 0) || (stricmp (*argv, "--debug") == 0)) {\r
       argc--; argv++;\r
       if (argc < 1) {\r

diff --git a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
index a76102cbb3511a529e227e9fbb1822a6b05bd5ff..e1d9de4d3c17fae14833362d0b9494c0bf249d9a 100644 (file)
--- a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
+++ b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
@@ -83,8 +83,9 @@ Returns:
 \r
 --*/\r
 {\r
-  printf ("%s v%d.%d %s -Utility to break a file into two pieces at the request offset.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
+  printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
   printf ("Copyright (c) 1999-2014 Intel Corporation. All rights reserved.\n");\r
+  printf ("\n  The EfiLdrImage tool is used to combine PE files into EFILDR image with Efi loader header.\n");\r
 }\r
 \r
 VOID\r

diff --git a/BaseTools/Source/C/Split/Split.c b/BaseTools/Source/C/Split/Split.c
index e8fea63510ed00213125a8ef33d0ee32568f08b0..b63aef78f9a2ef5c0855aa68535a7b668830b007 100644 (file)
--- a/BaseTools/Source/C/Split/Split.c
+++ b/BaseTools/Source/C/Split/Split.c
@@ -57,8 +57,10 @@ Returns:
 \r
 --*/\r
 {\r
-  printf ("%s v%d.%d %s -Utility to break a file into two pieces at the request offset.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
+  printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
   printf ("Copyright (c) 1999-2014 Intel Corporation. All rights reserved.\n");\r
+  printf ("\n  SplitFile creates two Binary files either in the same directory as the current working\n");\r
+  printf ("  directory or in the specified directory.\n");\r
 }\r
 \r
 void\r