tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 21:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools/VolInfo: Add definitions for command format strings

Browse Source 
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>
This commit is contained in:
Hao Wu 2016-10-08 20:53:48 +08:00
parent 38eb573b09
commit aeadb1c453
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BaseTools/Source/C/VolInfo/VolInfo.c
View File

@ -1599,7 +1599,6 @@ Returns:
CHAR8 *ExtractionTool; CHAR8 *ExtractionTool;
CHAR8 *ToolInputFile; CHAR8 *ToolInputFile;
CHAR8 *ToolOutputFile; CHAR8 *ToolOutputFile;
CHAR8 *SystemCommandFormatString;
CHAR8 *SystemCommand; CHAR8 *SystemCommand;
EFI_GUID *EfiGuid; EFI_GUID *EfiGuid;
UINT16 DataOffset; UINT16 DataOffset;
@ -1659,9 +1658,8 @@ Returns:
SectionLength - SectionHeaderLen SectionLength - SectionHeaderLen
); );
SystemCommandFormatString = "%s sha1 -out %s %s";
SystemCommand = malloc ( SystemCommand = malloc (
strlen (SystemCommandFormatString) + strlen (OPENSSL_COMMAND_FORMAT_STRING) +
strlen (OpenSslPath) + strlen (OpenSslPath) +
strlen (ToolInputFileName) + strlen (ToolInputFileName) +
strlen (ToolOutputFileName) + strlen (ToolOutputFileName) +
@ -1673,7 +1671,7 @@ Returns:
} }
sprintf ( sprintf (
SystemCommand, SystemCommand,
SystemCommandFormatString, OPENSSL_COMMAND_FORMAT_STRING,
OpenSslPath, OpenSslPath,
ToolOutputFileName, ToolOutputFileName,
ToolInputFileName ToolInputFileName
@ -1891,9 +1889,8 @@ Returns:
// //
// Construction 'system' command string // Construction 'system' command string
// //
SystemCommandFormatString = "%s -d -o %s %s";
SystemCommand = malloc ( SystemCommand = malloc (
strlen (SystemCommandFormatString) + strlen (EXTRACT_COMMAND_FORMAT_STRING) +
strlen (ExtractionTool) + strlen (ExtractionTool) +
strlen (ToolInputFile) + strlen (ToolInputFile) +
strlen (ToolOutputFile) + strlen (ToolOutputFile) +
@ -1909,7 +1906,7 @@ Returns:
} }
sprintf ( sprintf (
SystemCommand, SystemCommand,
SystemCommandFormatString, EXTRACT_COMMAND_FORMAT_STRING,
ExtractionTool, ExtractionTool,
ToolOutputFile, ToolOutputFile,
ToolInputFile ToolInputFile

5
BaseTools/Source/C/VolInfo/VolInfo.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Local Definitions for the VolInfo utility 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -31,4 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define EFI_SECTION_LAST_LEAF_SECTION_TYPE 0x1B #define EFI_SECTION_LAST_LEAF_SECTION_TYPE 0x1B
#define EFI_SECTION_LAST_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 #endif