Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 06:46:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vsprintf.c: add UTF-16 string (%ls) support

Browse source 
This is convenient for efi_loader which deals a lot with UTF-16.  Only
enabled with CC_SHORT_WCHAR, leaving room to add a UTF-32 version when
CC_SHORT_WCHAR is not enabled.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Rob Clark 2017-09-09 06:47:41 -04:00 • committed by Tom Rini
parent 78178bb0c9
commit 274325c509
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/api/Makefile
View file

@ -34,6 +34,7 @@ EXT_COBJ-y += lib/div64.o
EXT_COBJ-y += lib/string.o EXT_COBJ-y += lib/string.o
EXT_COBJ-y += lib/time.o EXT_COBJ-y += lib/time.o
EXT_COBJ-y += lib/vsprintf.o EXT_COBJ-y += lib/vsprintf.o
EXT_COBJ-y += lib/charset.o
EXT_SOBJ-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.o EXT_SOBJ-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.o
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
EXT_SOBJ-$(CONFIG_USE_ARCH_MEMSET) += arch/arm/lib/memset.o EXT_SOBJ-$(CONFIG_USE_ARCH_MEMSET) += arch/arm/lib/memset.o

26
lib/vsprintf.c
View file

@ -17,6 +17,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <common.h> #include <common.h>
#include <charset.h>
#include <div64.h> #include <div64.h>
#define noinline __attribute__((noinline)) #define noinline __attribute__((noinline))
@ -270,6 +271,26 @@ static char *string(char *buf, char *end, char *s, int field_width,
return buf; return buf;
} }
static char *string16(char *buf, char *end, u16 *s, int field_width,
int precision, int flags)
{
u16 *str = s ? s : L"<NULL>";
int utf16_len = utf16_strnlen(str, precision);
u8 utf8[utf16_len * MAX_UTF8_PER_UTF16];
int utf8_len, i;
utf8_len = utf16_to_utf8(utf8, str, utf16_len) - utf8;
if (!(flags & LEFT))
while (utf8_len < field_width--)
ADDCH(buf, ' ');
for (i = 0; i < utf8_len; ++i)
ADDCH(buf, utf8[i]);
while (utf8_len < field_width--)
ADDCH(buf, ' ');
return buf;
}
#ifdef CONFIG_CMD_NET #ifdef CONFIG_CMD_NET
static const char hex_asc[] = "0123456789abcdef"; static const char hex_asc[] = "0123456789abcdef";
#define hex_asc_lo(x) hex_asc[((x) & 0x0f)] #define hex_asc_lo(x) hex_asc[((x) & 0x0f)]
@ -528,8 +549,13 @@ repeat:
continue; continue;
case 's': case 's':
if (qualifier == 'l' && !IS_ENABLED(CONFIG_SPL_BUILD)) {
str = string16(str, end, va_arg(args, u16 *),
field_width, precision, flags);
} else {
str = string(str, end, va_arg(args, char *), str = string(str, end, va_arg(args, char *),
field_width, precision, flags); field_width, precision, flags);
}
continue; continue;
case 'p': case 'p':