diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2016-11-28 15:18:20 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-12-05 09:48:28 +0800 |
| commit | 3883e2cb52fa1582165d6558c67649835d0eada3 (patch) | |
| tree | 7458ab3ad514d018782d5e2e09389a92f1397e1e /BaseTools | |
| parent | 0db4acb61ac4e79a8a95b0e82874e8b6bed8e4bb (diff) | |
| download | edk2-3883e2cb52fa1582165d6558c67649835d0eada3.zip edk2-3883e2cb52fa1582165d6558c67649835d0eada3.tar.gz edk2-3883e2cb52fa1582165d6558c67649835d0eada3.tar.bz2 | |
BaseTools/VolInfo: Fix printf issue using '%ls' in format string
https://bugzilla.tianocore.org/show_bug.cgi?id=257
For GCC compilers, when building with option '-fshort-wchar', wide char
string format '%ls' does not work properly for printf() function. The
string specified by '%ls' will not be printed.
This commit avoids using '%ls' for printf() function and converts the wide
char string to char string for printing.
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>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/C/VolInfo/VolInfo.c | 69 |
1 files changed, 68 insertions, 1 deletions
diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c index 46c7212..71917af 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -148,6 +148,65 @@ Usage ( VOID
);
+UINT32
+UnicodeStrLen (
+ IN CHAR16 *String
+ )
+ /*++
+
+ Routine Description:
+
+ Returns the length of a null-terminated unicode string.
+
+ Arguments:
+
+ String - The pointer to a null-terminated unicode string.
+
+ Returns:
+
+ N/A
+
+ --*/
+{
+ UINT32 Length;
+
+ for (Length = 0; *String != L'\0'; String++, Length++) {
+ ;
+ }
+ return Length;
+}
+
+VOID
+Unicode2AsciiString (
+ IN CHAR16 *Source,
+ OUT CHAR8 *Destination
+ )
+ /*++
+
+ Routine Description:
+
+ Convert a null-terminated unicode string to a null-terminated ascii string.
+
+ Arguments:
+
+ Source - The pointer to the null-terminated input unicode string.
+ Destination - The pointer to the null-terminated output ascii string.
+
+ Returns:
+
+ N/A
+
+ --*/
+{
+ while (*Source != '\0') {
+ *(Destination++) = (CHAR8) *(Source++);
+ }
+ //
+ // End the ascii with a NULL.
+ //
+ *Destination = '\0';
+}
+
int
main (
int argc,
@@ -1606,6 +1665,7 @@ Returns: UINT32 RealHdrLen;
CHAR8 *ToolInputFileName;
CHAR8 *ToolOutputFileName;
+ CHAR8 *UIFileName;
ParsedLength = 0;
ToolInputFileName = NULL;
@@ -1714,7 +1774,14 @@ Returns: break;
case EFI_SECTION_USER_INTERFACE:
- printf (" String: %ls\n", (wchar_t *) &((EFI_USER_INTERFACE_SECTION *) Ptr)->FileNameString);
+ UIFileName = (CHAR8 *) malloc (UnicodeStrLen (((EFI_USER_INTERFACE_SECTION *) Ptr)->FileNameString) + 1);
+ if (UIFileName == NULL) {
+ Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");
+ return EFI_OUT_OF_RESOURCES;
+ }
+ Unicode2AsciiString (((EFI_USER_INTERFACE_SECTION *) Ptr)->FileNameString, UIFileName);
+ printf (" String: %s\n", UIFileName);
+ free (UIFileName);
break;
case EFI_SECTION_FIRMWARE_VOLUME_IMAGE:
|