From d90aa46258726412d9b9d77cfeb879adad837067 Mon Sep 17 00:00:00 2001 From: lhauch Date: Mon, 25 Aug 2014 20:06:55 +0000 Subject: BootSectImage.exe, EfiLdrImage.exe and Split.exe tools have incorrect output from the --version option. This patch fixes the --version option output and corrects the description displayed. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lhauch Reviewed-by: Gao, Liming git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15890 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/BootSectImage/bootsectimage.c | 9 +++++++-- BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c | 3 ++- BaseTools/Source/C/Split/Split.c | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'BaseTools') diff --git a/BaseTools/Source/C/BootSectImage/bootsectimage.c b/BaseTools/Source/C/BootSectImage/bootsectimage.c index fd367c28b3..b4fb340c2b 100644 --- a/BaseTools/Source/C/BootSectImage/bootsectimage.c +++ b/BaseTools/Source/C/BootSectImage/bootsectimage.c @@ -56,8 +56,10 @@ Returns: --*/ { - 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); - printf ("Copyright (c) 1999-2010 Intel Corporation. All rights reserved.\n"); + printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); + printf ("Copyright (c) 1999-2014 Intel Corporation. All rights reserved.\n"); + printf ("\n The BootSectImage tool prints information or patch destination file by source\n"); + printf (" file for BIOS Parameter Block (BPB) or Master Boot Record (MBR).\n"); } void @@ -889,6 +891,9 @@ main ( ProcessMbr = TRUE; } else if (strcmp (*argv, "-v") == 0 || strcmp (*argv, "--verbose") == 0) { Verbose = TRUE; + } else if (strcmp (*argv, "--version") == 0) { + Version(); + return 0; } else if ((stricmp (*argv, "-d") == 0) || (stricmp (*argv, "--debug") == 0)) { argc--; argv++; if (argc < 1) { diff --git a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c index a76102cbb3..e1d9de4d3c 100644 --- a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c +++ b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c @@ -83,8 +83,9 @@ Returns: --*/ { - 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); + printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); printf ("Copyright (c) 1999-2014 Intel Corporation. All rights reserved.\n"); + printf ("\n The EfiLdrImage tool is used to combine PE files into EFILDR image with Efi loader header.\n"); } VOID diff --git a/BaseTools/Source/C/Split/Split.c b/BaseTools/Source/C/Split/Split.c index e8fea63510..b63aef78f9 100644 --- a/BaseTools/Source/C/Split/Split.c +++ b/BaseTools/Source/C/Split/Split.c @@ -57,8 +57,10 @@ Returns: --*/ { - 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); + printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); printf ("Copyright (c) 1999-2014 Intel Corporation. All rights reserved.\n"); + printf ("\n SplitFile creates two Binary files either in the same directory as the current working\n"); + printf (" directory or in the specified directory.\n"); } void -- cgit v1.2.3