commit aeadb1c453174d543ad95d2a601e229506b2679e
author Hao Wu <hao.a.wu@intel.com> Sat Oct 08 20:53:48 2016 +0800
committer Hao Wu <hao.a.wu@intel.com> Tue Nov 08 16:38:23 2016 +0800
tree a327b0b7bcaa31f1ef8ef934a733c00598e8e715
parent 38eb573b0966af0879b85d5d83b430d95b31a884

BaseTools/VolInfo: Add definitions for command format strings

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

BaseTools/Source/C/VolInfo/VolInfo.c

diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c
index 5285acd..46c7212 100644
--- a/BaseTools/Source/C/VolInfo/VolInfo.c
+++ b/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -1599,7 +1599,6 @@
   CHAR8               *ExtractionTool;

   CHAR8               *ToolInputFile;

   CHAR8               *ToolOutputFile;

-  CHAR8               *SystemCommandFormatString;

   CHAR8               *SystemCommand;

   EFI_GUID            *EfiGuid;

   UINT16              DataOffset;

@@ -1659,9 +1658,8 @@
           SectionLength - SectionHeaderLen

           );

 

-        SystemCommandFormatString = "%s sha1 -out %s %s";

         SystemCommand = malloc (

-          strlen (SystemCommandFormatString) +

+          strlen (OPENSSL_COMMAND_FORMAT_STRING) +

           strlen (OpenSslPath) +

           strlen (ToolInputFileName) +

           strlen (ToolOutputFileName) +

@@ -1673,7 +1671,7 @@
         }

         sprintf (

           SystemCommand,

-          SystemCommandFormatString,

+          OPENSSL_COMMAND_FORMAT_STRING,

           OpenSslPath,

           ToolOutputFileName,

           ToolInputFileName

@@ -1891,9 +1889,8 @@
         //

         // Construction 'system' command string

         //

-        SystemCommandFormatString = "%s -d -o %s %s";

         SystemCommand = malloc (

-          strlen (SystemCommandFormatString) +

+          strlen (EXTRACT_COMMAND_FORMAT_STRING) +

           strlen (ExtractionTool) +

           strlen (ToolInputFile) +

           strlen (ToolOutputFile) +

@@ -1909,7 +1906,7 @@
         }

         sprintf (

           SystemCommand,

-          SystemCommandFormatString,

+          EXTRACT_COMMAND_FORMAT_STRING,

           ExtractionTool,

           ToolOutputFile,

           ToolInputFile

BaseTools/Source/C/VolInfo/VolInfo.h

diff --git a/BaseTools/Source/C/VolInfo/VolInfo.h b/BaseTools/Source/C/VolInfo/VolInfo.h
index 0ef7d92..dff64e7 100644
--- a/BaseTools/Source/C/VolInfo/VolInfo.h
+++ b/BaseTools/Source/C/VolInfo/VolInfo.h
@@ -1,7 +1,7 @@
 /** @file

 Local Definitions for the VolInfo utility

 

-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -31,4 +31,7 @@
 #define EFI_SECTION_LAST_LEAF_SECTION_TYPE  0x1B

 #define EFI_SECTION_LAST_SECTION_TYPE       0x1B

 

+#define OPENSSL_COMMAND_FORMAT_STRING       "%s sha1 -out %s %s"

+#define EXTRACT_COMMAND_FORMAT_STRING       "%s -d -o %s %s"

+

 #endif