From patchwork Wed Aug 9 23:14:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 800027 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bZNeNl/M"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xSRvp53GSz9s4q for ; Thu, 10 Aug 2017 09:15:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 38E1FC21D5B; Wed, 9 Aug 2017 23:15:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A76CDC21D9E; Wed, 9 Aug 2017 23:15:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A6592C21D7B; Wed, 9 Aug 2017 23:15:07 +0000 (UTC) Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by lists.denx.de (Postfix) with ESMTPS id D2220C21D83 for ; Wed, 9 Aug 2017 23:15:02 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id c15so7293350qta.3 for ; Wed, 09 Aug 2017 16:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cTh3nQy7QFA5tF5iHn8FRi0unYk48br4mp6Pn3Cjwqc=; b=bZNeNl/MzOFNfHZ8SVIGaT9Kc2VqzXMCTZGEJ7CB7rA3y4ArfXKBVPgZXUMA8+1CjP +Plv6KAd+W6t8/RkAP+LJ2CHVxhNJOLybsU7XUw3Ukn7YjWn72wJlEa9cn+GycV71iv9 sie9Uc/JZ55ilGFKy91/rTbilgIycmEg6bRMrjeo9lYA39/RwVXUmXjvyb5UN7Bttvh8 l9BTO19LqGWrsT+9i0cV/H5iOmeoAraG0YVKYhmVRRgl8RwumnYgGOQUw7GU40zNHPcS pAJTBKYbZfNG6ikC0scWHPxjrlyilKfoS4hT4sc7layXXqT3tJiAVdoEB7S6amU2EG5/ TtCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cTh3nQy7QFA5tF5iHn8FRi0unYk48br4mp6Pn3Cjwqc=; b=ewuNpRMVVW2fY4v513Ykbe8D9ScweB7qeEpikTAOdcUr+ZHCFfc3oOJ4dwEJgdl4Xy /eypnuoMvI2IsT30x+SWK6gIRWqMXyf8Wr0INJW/1kLNQ2PP2e58eR+D5wmB2w0QkySm OXpvSs+iV6ASy7FoRMncBEecGTPwhvHoWEo9cTTC1q5EplVgM/USmXEcm6w/+ca3Kb3m x2Ds/xMHINWIia40JwQA2+j3baKVs2g8ii4b4Bq+tBZvLLpp6Esr5zaNRYHqe9h6zGNe pLjZ5m/PTCR19u3486zXoDb6nujC9tI3CgA/orSJ2mGh4KSFpBCIDRuPxzOcf6vDZ0zq pJHw== X-Gm-Message-State: AHYfb5gdbsGwmzhIOFTPB3jsyeBMF6x7XkSjYoIBWCPTX5MZ7sP2lRqN QCi9T4eBJ47W6fqck4U= X-Received: by 10.237.32.172 with SMTP id 41mr13679491qtb.260.1502320501577; Wed, 09 Aug 2017 16:15:01 -0700 (PDT) Received: from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a]) by smtp.gmail.com with ESMTPSA id r191sm2581577qke.77.2017.08.09.16.15.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2017 16:15:00 -0700 (PDT) From: Rob Clark To: U-Boot Mailing List Date: Wed, 9 Aug 2017 19:14:33 -0400 Message-Id: <20170809231441.22691-4-robdclark@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170809231441.22691-1-robdclark@gmail.com> References: <20170809231441.22691-1-robdclark@gmail.com> Cc: Stefan Roese Subject: [U-Boot] [PATCH 3/5] vsprintf.c: add UTF-16 string (%ls) support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Simon Glass --- examples/api/Makefile | 1 + lib/vsprintf.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/examples/api/Makefile b/examples/api/Makefile index dab6398bab..87c15d0f68 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -34,6 +34,7 @@ EXT_COBJ-y += lib/div64.o EXT_COBJ-y += lib/string.o EXT_COBJ-y += lib/time.o EXT_COBJ-y += lib/vsprintf.o +EXT_COBJ-y += lib/charset.o EXT_SOBJ-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.o ifeq ($(ARCH),arm) EXT_SOBJ-$(CONFIG_USE_ARCH_MEMSET) += arch/arm/lib/memset.o diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 874a2951f7..0678b49b01 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -17,6 +17,7 @@ #include #include +#include #include #define noinline __attribute__((noinline)) @@ -270,6 +271,26 @@ static char *string(char *buf, char *end, char *s, int field_width, return buf; } +static char *string16(char *buf, char *end, u16 *s, int field_width, + int precision, int flags) +{ + u16 *str = s ? s : (u16[]){'<','N','U','L','L','>','\0'}; + 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 static const char hex_asc[] = "0123456789abcdef"; #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] @@ -528,8 +549,14 @@ repeat: continue; case 's': - str = string(str, end, va_arg(args, char *), - field_width, precision, flags); + if (CONFIG_IS_ENABLED(CC_SHORT_WCHAR) && + qualifier == 'l') { + str = string16(str, end, va_arg(args, u16 *), + field_width, precision, flags); + } else { + str = string(str, end, va_arg(args, char *), + field_width, precision, flags); + } continue; case 'p':