From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id ED06B385455B; Mon, 12 Dec 2022 15:21:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED06B385455B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670858467; bh=Sa73XgSSH3m/Js9ZKYCkDjYvZc/b1+sYR/sNc6QnhkI=; h=From:To:Subject:Date:From; b=Ut47tNnuL//942WEr0hQ51yeDW/COCPbeL4KC8hSA0qPG/G1R/dnqDNPHK1vxdD15 hT4wUGNtJQh87ARuTJlh7lQMvyasoOKNt6bdxWgJa4rychkP1vfc7g6Z2ReSqz/HAh vvVawWIccAWxIPHwJvkkGi3u0T//Cv4C6qSStMqE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/fw/vfprintf-2] stdio-common: Add __translated_number_width X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/fw/vfprintf-2 X-Git-Oldrev: 8699991d4d2c2a85ee497acb9d2740a2afef0816 X-Git-Newrev: 8566149e25485ca6e0cafa0c3e7366d3f7efe532 Message-Id: <20221212152107.ED06B385455B@sourceware.org> Date: Mon, 12 Dec 2022 15:21:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8566149e25485ca6e0cafa0c3e7366d3f7efe532 commit 8566149e25485ca6e0cafa0c3e7366d3f7efe532 Author: Florian Weimer Date: Thu Aug 18 08:49:54 2022 +0200 stdio-common: Add __translated_number_width This function will be used to compute the width of a number after i18n digit translation. Diff: --- include/printf.h | 13 ++++++++++- stdio-common/Makefile | 1 + stdio-common/translated_number_width.c | 42 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/include/printf.h b/include/printf.h index 8f064149d3..5127a45f9b 100644 --- a/include/printf.h +++ b/include/printf.h @@ -53,7 +53,18 @@ int __wprintf_function_invoke (void *, printf_function callback, #include -/* Now define the internal interfaces. */ +/* Returns the width (as for printf, in bytes) of the converted ASCII + number in the characters in the range [FIRST, LAST). The range + must only contain ASCII digits. The caller is responsible for + avoiding overflow. + + This function is used during non-wide digit translation. Wide + digit translate produces one wide character per ASCII digit, + so the width is simply LAST - FIRST. */ +int __translated_number_width (locale_t loc, + const char *first, const char *last) + attribute_hidden; + extern int __printf_fphex (FILE *, const struct printf_info *, const void *const *) attribute_hidden; extern int __printf_fp (FILE *, const struct printf_info *, diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 6e6da091b1..3e0c574ca5 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -85,6 +85,7 @@ routines := \ tmpfile64 \ tmpnam \ tmpnam_r \ + translated_number_width \ vfprintf \ vfprintf-internal \ vfscanf \ diff --git a/stdio-common/translated_number_width.c b/stdio-common/translated_number_width.c new file mode 100644 index 0000000000..f42d5968a1 --- /dev/null +++ b/stdio-common/translated_number_width.c @@ -0,0 +1,42 @@ +/* Compute the printf width of a sequence of ASCII digits. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include + +int +__translated_number_width (locale_t loc, const char *first, const char *last) +{ + struct lc_ctype_data *ctype = loc->__locales[LC_CTYPE]->private; + + if (ctype->outdigit_bytes_all_equal > 0) + return (last - first) * ctype->outdigit_bytes_all_equal; + else + { + /* Digits have varying length, so the fast path cannot be used. */ + int digits = 0; + for (const char *p = first; p < last; ++p) + { + assert ('0' <= *p && *p <= '9'); + digits += ctype->outdigit_bytes[*p - '0']; + } + return digits; + } +}