dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/vsprintf: allow printing upper case GUIDs

Browse Source 
In the UEFI context GUIDs are expected to be rendered in upper case.

The patch uses the formerly unused bit 1 of the parameter str_format
of function uuid_bin_to_str() to indicate if we need upper or lower case
output.

Function uuid_string() in vsprint.c is adjusted to correctly set the bit
depending on the print format code.

%pUb: 01020304-0506-0708-090a-0b0c0d0e0f10
%pUB: 01020304-0506-0708-090A-0B0C0D0E0F10
%pUl: 04030201-0605-0807-090a-0b0c0d0e0f10
%pUL: 04030201-0605-0807-090A-0B0C0D0E0F10

Up to this point only a diagnostic message in mount_ubifs() using '%pUB' is
concerned by the change. Further patches are needed to adjust the UEFI
subsystem.

A unit test is provided inside the ut_print command.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt
2019-04-29 08:08:43 +02:00
committed by Tom Rini
parent dbbb1c43f2
commit 3bad256f5b
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/vsprintf.c
View File

@@ -383,29 +383,31 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
#ifdef CONFIG_LIB_UUID
/*
* This works (roughly) the same way as linux's, but we currently always
* print lower-case (ie. we just keep %pUB and %pUL for compat with linux),
* mostly just because that is what uuid_bin_to_str() supports.
* This works (roughly) the same way as Linux's.
*
* %pUb: 01020304-0506-0708-090a-0b0c0d0e0f10
* %pUB: 01020304-0506-0708-090A-0B0C0D0E0F10
* %pUl: 04030201-0605-0807-090a-0b0c0d0e0f10
* %pUL: 04030201-0605-0807-090A-0B0C0D0E0F10
*/
static char *uuid_string(char *buf, char *end, u8 *addr, int field_width,
int precision, int flags, const char *fmt)
{
char uuid[UUID_STR_LEN + 1];
int str_format = UUID_STR_FORMAT_STD;
int str_format;
switch (*(++fmt)) {
case 'L':
str_format = UUID_STR_FORMAT_GUID | UUID_STR_UPPER_CASE;
break;
case 'l':
str_format = UUID_STR_FORMAT_GUID;
break;
case 'B':
case 'b':
/* this is the default */
str_format = UUID_STR_FORMAT_STD | UUID_STR_UPPER_CASE;
break;
default:
str_format = UUID_STR_FORMAT_STD;
break;
}