From patchwork Wed Apr 22 18:37:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 133700 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 6B483409FB96 for ; Wed, 22 Apr 2026 18:55:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B483409FB96 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=lV6HR3mx X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by sourceware.org (Postfix) with ESMTPS id 9F14248FA83D for ; Wed, 22 Apr 2026 18:38:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F14248FA83D Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9F14248FA83D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883080; cv=none; b=Y9ZWuYTpsSb8IHMherCIcIFl1UkoTM5TXF2idlsHndz2VLecPDkoCZo/ZCFRED4s3uOvAYbuZBiYB8k65ekay9gzqSABRXFOgvF0OyzxUgiDYCPj4D9wuVTZS2tgmu2a4u/9pQ9OGaBPbYeq1PdQY14pkG9qRe3K6t/VhtaWOA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883080; c=relaxed/simple; bh=z0Fxy8t61Uuz4nb9V7phpN65aR0dBAEVBRpBgvtofIs=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=SZbwvqGdI5G0XKFwN4UZH4vrBXh7O+5P42Nb6XUYR6OgtUQSpyA2Uoq3EbJNVX1C9J0sKtI5BUk2FM+HQ0ftSO+Giw0t7AOvccvRPRbX7oeKWS7Dg9+ov0oo3cW2Irpi3Z59LosYJo+/a66eXkLbaklvAdr1bYDJLLn4BXCp+Fk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9F14248FA83D Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id E31F140704; Wed, 22 Apr 2026 18:37:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4400BC19425; Wed, 22 Apr 2026 18:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776883079; bh=z0Fxy8t61Uuz4nb9V7phpN65aR0dBAEVBRpBgvtofIs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lV6HR3mxInZrE3LsJCko5bggtqSZoS0stNrAA7meg+OEMB40BAR0U+ufY/nJsaqlu EtRFgeSpdKag+5qEL9/LNHJi4mf/Tl9CYl/KfnTznpJ+uOkGYDctSWkujgbi9OSruK EhFQ2WvBASjUxYfMHShi1oQxRxU1klXIxGRZ9icBiniwhUP5EK3iKDJX4L1UokR9Ij 2QS4ZufSUP0bMTdFx7VUbV/NKC7vIwsj9tmNmB4YST+7+14XNdO1oxLEn3+iBJHjKl s3OeGKg14GRqhiM28bRWHamGGoCPI4rYumenvJ48ig3vIR3h0wixeZ2rT7X5kvDLxP Fz+LTdqd/C5DQ== Date: Wed, 22 Apr 2026 20:37:55 +0200 From: Alejandro Colomar To: libc-alpha@sourceware.org Cc: Alejandro Colomar , Joseph Myers , Paul Eggert , Adhemerval Zanella Netto , Florian Weimer , "Dmitry V. Levin" , Archie Cobbs , Solar Designer , Sam James , Bruno Haible Subject: [PATCH 1/3] Add [v]aprintf(3) Message-ID: <4c17f2c584e30390d8a4418f7628e3fed29445f0.1776882798.git.alx@kernel.org> X-Mailer: git-send-email 2.53.0 References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This function is fundamentally the same as asprintf(3) --which was standardized in POSIX.1-2024--. However, it has a key difference, which makes it a much better design. Instead of returning the newly allocated pointer through a char** parameter, it returns the pointer (like strdup(3)). The API is as simple as it can be: char *aprintf(const char *restrict fmt, ...); char *vaprintf(const char *restrict fmt, va_list ap); This difference has several benefits: - One less parameter. This means less source code for using this API, which implicitly means less chances of making mistakes. It is also less noise while reading code, which increases readability. Especially, we get rid of a pointer-to-pointer parameter, which are especially weird. - The function has an prototype that resembles strdup(3). This functionality is commonly paired with strdup(3) calls, because they're very related. By having a similar prototype, the code is more naturally paired with Compare: if (cond) { p = strdup("foo"); if (p == NULL) goto fail; } else { if (asprintf(&p, "foo %d", 42) < 0) goto fail; } vs p = cond ? strdup("foo") : aprintf("foo %d", 42); if (p == NULL) goto fail; - We don't need to fail with EOVERFLOW. This initial implementation still fails with EOVERFLOW, because it would require a lot of work implementing it in a way that doesn't have such a failure point, but the API has no inherent reasons to fail with EOVERFLOW. - This API returns a pointer, which makes it possible to use __attribute__((__malloc__(free))). This would allow static analysers to know that these APIs allocate memory, which would prevent memory leaks, use-after-free errors, and other common issues of handling memory. The name is similar to asprintf(3), removing the 's'. This is the same name that gnulib has used for their implementation. It also matches the name of the n3750 (alx-0007) proposal for ISO C2y. The C Committee was worried that such a non-reserved name might be unlikely to be viable, as some existing code already uses it. However: - Most code using this name, uses it with the same exact semantics. In those cases, it's not a problem. - In the remaining cases, the prototype is different, so they'll eventually get a compiler error for the clash. This is entirely safe. And by hiding the name under _GNU_SOURCE, we make that clash less likely. Once/if this is eventually standard, I expect people will adapt their code, which is entirely reasonable. Still, then the APIs will be hidden under _ISOC2Y_SOURCE et al., so this will only affect users when they opt-in to such a version. Link: Cc: Joseph Myers Cc: Paul Eggert Cc: Bruno Haible Cc: Adhemerval Zanella Netto Cc: Florian Weimer Cc: "Dmitry V. Levin" Cc: Archie Cobbs Cc: Solar Designer Cc: Sam James Signed-off-by: Alejandro Colomar --- debug/Makefile | 4 ++ debug/Versions | 3 + debug/aprintf_chk.c | 51 ++++++++++++++++ debug/vaprintf_chk.c | 39 ++++++++++++ include/stdio.h | 8 +++ libio/Makefile | 4 +- libio/Versions | 3 + libio/bits/stdio-ldbl.h | 5 ++ libio/bits/stdio2-decl.h | 8 +++ libio/bits/stdio2.h | 42 +++++++++++++ libio/stdio.h | 13 ++++ libio/tst-aprintf.c | 57 ++++++++++++++++++ libio/vaprintf.c | 39 ++++++++++++ manual/stdio.texi | 26 ++++++++ stdio-common/Makefile | 2 + stdio-common/Versions | 3 + stdio-common/aprintf.c | 40 +++++++++++++ sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 8 ++- sysdeps/ieee754/ldbl-128ibm-compat/Versions | 6 ++ .../ldbl-128ibm-compat/ieee128-aprintf.c | 36 +++++++++++ .../ldbl-128ibm-compat/ieee128-aprintf_chk.c | 40 +++++++++++++ .../ldbl-128ibm-compat/ieee128-vaprintf.c | 29 +++++++++ .../ldbl-128ibm-compat/ieee128-vaprintf_chk.c | 31 ++++++++++ .../test-printf-chk-ldbl-compat.c | 31 +++++++++- .../test-printf-ldbl-compat.c | 31 +++++++++- sysdeps/ieee754/ldbl-opt/Makefile | 6 ++ sysdeps/ieee754/ldbl-opt/Versions | 10 ++++ sysdeps/ieee754/ldbl-opt/nldbl-aprintf.c | 17 ++++++ sysdeps/ieee754/ldbl-opt/nldbl-aprintf_chk.c | 15 +++++ sysdeps/ieee754/ldbl-opt/nldbl-compat.c | 59 +++++++++++++++++++ sysdeps/ieee754/ldbl-opt/nldbl-compat.h | 5 ++ sysdeps/ieee754/ldbl-opt/nldbl-vaprintf.c | 9 +++ sysdeps/ieee754/ldbl-opt/nldbl-vaprintf_chk.c | 8 +++ sysdeps/mach/hurd/i386/libc.abilist | 5 ++ sysdeps/mach/hurd/x86_64/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/aarch64/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/alpha/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/arc/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/arm/be/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/arm/le/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/csky/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/hppa/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/i386/libc.abilist | 5 ++ .../sysv/linux/loongarch/lp64/libc.abilist | 5 ++ .../sysv/linux/m68k/coldfire/libc.abilist | 5 ++ .../unix/sysv/linux/m68k/m680x0/libc.abilist | 5 ++ .../sysv/linux/microblaze/be/libc.abilist | 5 ++ .../sysv/linux/microblaze/le/libc.abilist | 5 ++ .../sysv/linux/mips/mips32/fpu/libc.abilist | 5 ++ .../sysv/linux/mips/mips32/nofpu/libc.abilist | 5 ++ .../sysv/linux/mips/mips64/n32/libc.abilist | 5 ++ .../sysv/linux/mips/mips64/n64/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/or1k/libc.abilist | 5 ++ .../linux/powerpc/powerpc32/fpu/libc.abilist | 5 ++ .../powerpc/powerpc32/nofpu/libc.abilist | 5 ++ .../linux/powerpc/powerpc64/be/libc.abilist | 5 ++ .../linux/powerpc/powerpc64/le/libc.abilist | 5 ++ .../unix/sysv/linux/riscv/rv32/libc.abilist | 5 ++ .../unix/sysv/linux/riscv/rv64/libc.abilist | 5 ++ .../unix/sysv/linux/s390/s390-32/libc.abilist | 5 ++ .../unix/sysv/linux/s390/s390-64/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/sh/be/libc.abilist | 5 ++ sysdeps/unix/sysv/linux/sh/le/libc.abilist | 5 ++ .../sysv/linux/sparc/sparc32/libc.abilist | 5 ++ .../sysv/linux/sparc/sparc64/libc.abilist | 5 ++ .../unix/sysv/linux/x86_64/64/libc.abilist | 5 ++ .../unix/sysv/linux/x86_64/x32/libc.abilist | 5 ++ 67 files changed, 852 insertions(+), 6 deletions(-) create mode 100644 debug/aprintf_chk.c create mode 100644 debug/vaprintf_chk.c create mode 100644 libio/tst-aprintf.c create mode 100644 libio/vaprintf.c create mode 100644 stdio-common/aprintf.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-opt/nldbl-aprintf.c create mode 100644 sysdeps/ieee754/ldbl-opt/nldbl-aprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-opt/nldbl-vaprintf.c create mode 100644 sysdeps/ieee754/ldbl-opt/nldbl-vaprintf_chk.c diff --git a/debug/Makefile b/debug/Makefile index c6c1069b..765720a1 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -31,6 +31,7 @@ headers := execinfo.h routines = \ $(static-only-routines) \ ____longjmp_chk \ + aprintf_chk \ asprintf_chk \ backtrace \ backtracesyms \ @@ -94,6 +95,7 @@ routines = \ strncpy_chk \ swprintf_chk \ ttyname_r_chk \ + vaprintf_chk \ vasprintf_chk \ vdprintf_chk \ vfprintf_chk \ @@ -143,6 +145,8 @@ CFLAGS-sprintf_chk.c += $(libio-mtsafe) CFLAGS-snprintf_chk.c += $(libio-mtsafe) CFLAGS-vsprintf_chk.c += $(libio-mtsafe) CFLAGS-vsnprintf_chk.c += $(libio-mtsafe) +CFLAGS-aprintf_chk.c += $(libio-mtsafe) +CFLAGS-vaprintf_chk.c += $(libio-mtsafe) CFLAGS-asprintf_chk.c += $(libio-mtsafe) CFLAGS-vasprintf_chk.c += $(libio-mtsafe) CFLAGS-obprintf_chk.c += $(libio-mtsafe) diff --git a/debug/Versions b/debug/Versions index fc818d29..d87148f5 100644 --- a/debug/Versions +++ b/debug/Versions @@ -71,6 +71,9 @@ libc { GLIBC_2.43 { __memset_explicit_chk; } + GLIBC_2.44 { + __aprintf_chk; __vaprintf_chk; + } GLIBC_PRIVATE { __fortify_fail; } diff --git a/debug/aprintf_chk.c b/debug/aprintf_chk.c new file mode 100644 index 00000000..30f7811f --- /dev/null +++ b/debug/aprintf_chk.c @@ -0,0 +1,51 @@ +/* Copyright (C) 2026 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 + + +/* Write formatted output from FORMAT to a string allocated with malloc. */ +char * +___aprintf_chk (int flag, const char *fmt, ...) +{ + /* For flag > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n + can only come from read-only format strings. */ + unsigned int mode = (flag > 0) ? PRINTF_FORTIFY : 0; + va_list ap; + char *p; + + va_start (ap, fmt); + if (__vasprintf_internal (&p, fmt, ap, mode) < 0) + p = NULL; + va_end (ap); + + return p; +} +#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +/* This is needed since is included in this case, leading to + * multiple asm redirection of the same symbol + */ +ldbl_hidden_def (___aprintf_chk, __aprintf_chk) +ldbl_strong_alias (___aprintf_chk, __aprintf_chk) +#else +/* On some systems introduction of ldbl_* macros lead to ABI breakage due to the + * long_double_symbol aliasing. + */ +strong_alias (___aprintf_chk, __aprintf_chk) +libc_hidden_def (__aprintf_chk) +#endif diff --git a/debug/vaprintf_chk.c b/debug/vaprintf_chk.c new file mode 100644 index 00000000..1ca96633 --- /dev/null +++ b/debug/vaprintf_chk.c @@ -0,0 +1,39 @@ +/* Copyright (C) 2026 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 + . + + As a special exception, if you link the code in this file with + files compiled with a GNU compiler to produce an executable, + that does not cause the resulting executable to be covered by + the GNU Lesser General Public License. This exception does not + however invalidate any other reasons why the executable file + might be covered by the GNU Lesser General Public License. + This exception applies to code released by its copyright holders + in files containing the exception. */ + +#include + +char * +__vaprintf_chk (int flag, const char *fmt, va_list ap) +{ + /* For flag > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n + can only come from read-only format strings. */ + unsigned int mode = (flag > 0) ? PRINTF_FORTIFY : 0; + char *p; + + return __vasprintf_internal (&p, fmt, ap, mode) < 0 ? NULL : p; +} +libc_hidden_def (__vaprintf_chk) diff --git a/include/stdio.h b/include/stdio.h index 88166993..cfdec368 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -77,6 +77,11 @@ extern int __vfprintf_chk (FILE *, int, const char *, __gnuc_va_list); stdio_hidden_ldbl_proto (__, vfprintf_chk) extern char *__fgets_unlocked_chk (char *buf, size_t size, int n, FILE *fp); extern char *__fgets_chk (char *buf, size_t size, int n, FILE *fp); +extern char *__aprintf_chk (int, const char *, ...) + __THROW __attribute_malloc__; +extern char *__vaprintf_chk (int, const char *, __gnuc_va_list) + __THROW __attribute_malloc__; +stdio_hidden_ldbl_proto (__, vaprintf_chk) extern int __asprintf_chk (char **, int, const char *, ...) __THROW; extern int __vasprintf_chk (char **, int, const char *, __gnuc_va_list) __THROW; stdio_hidden_ldbl_proto (__, vasprintf_chk) @@ -239,6 +244,7 @@ extern const size_t _sys_errlist_internal_len attribute_hidden; extern const char *__get_errlist (int) attribute_hidden; extern const char *__get_errname (int) attribute_hidden; +libc_hidden_ldbl_proto (__aprintf) libc_hidden_ldbl_proto (__asprintf) # if IS_IN (libc) @@ -317,8 +323,10 @@ rtld_hidden_proto (__libc_fatal) libc_hidden_proto (__fgets_unlocked_chk) #if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +libc_hidden_ldbl_proto (__aprintf_chk) libc_hidden_ldbl_proto (__asprintf_chk) #else +libc_hidden_proto (__aprintf_chk) libc_hidden_proto (__asprintf_chk) #endif diff --git a/libio/Makefile b/libio/Makefile index 08e1e0ec..b345f806 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -43,7 +43,7 @@ routines := \ \ clearerr feof ferror fileno fputc freopen fseek getc getchar \ memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \ - iovdprintf vscanf vsnprintf obprintf fcloseall fseeko ftello \ + vaprintf iovdprintf vscanf vsnprintf obprintf fcloseall fseeko ftello \ freopen64 fseeko64 ftello64 \ \ __fbufsize __freading __fwriting __freadable __fwritable __flbf \ @@ -62,6 +62,7 @@ routines_no_fortify += \ iofgetws_u \ iovdprintf \ swprintf \ + vaprintf \ vasprintf \ vsnprintf \ vswprintf \ @@ -89,6 +90,7 @@ tests = \ test-fmemopen \ test-fputs-unbuffered-full \ test-fputws-unbuffered-full \ + tst-aprintf \ tst-asprintf-null \ tst-atime \ tst-bz22415 \ diff --git a/libio/Versions b/libio/Versions index b91a7bc9..48ffe3d3 100644 --- a/libio/Versions +++ b/libio/Versions @@ -155,6 +155,9 @@ libc { # f* fmemopen; } + GLIBC_2.44 { + vaprintf; + } GLIBC_PRIVATE { # Used by NPTL and librt __libc_fatal; diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h index 3cbff14e..3b805b3e 100644 --- a/libio/bits/stdio-ldbl.h +++ b/libio/bits/stdio-ldbl.h @@ -99,6 +99,9 @@ __LDBL_REDIR_DECL (dprintf) #endif #ifdef __USE_GNU +__LDBL_REDIR_DECL (vaprintf) +__LDBL_REDIR2_DECL (aprintf) +__LDBL_REDIR_DECL (aprintf) __LDBL_REDIR_DECL (vasprintf) __LDBL_REDIR2_DECL (asprintf) __LDBL_REDIR_DECL (asprintf) @@ -123,6 +126,8 @@ __LDBL_REDIR2_DECL (dprintf_chk) __LDBL_REDIR2_DECL (vdprintf_chk) # endif # ifdef __USE_GNU +__LDBL_REDIR2_DECL (aprintf_chk) +__LDBL_REDIR2_DECL (vaprintf_chk) __LDBL_REDIR2_DECL (asprintf_chk) __LDBL_REDIR2_DECL (vasprintf_chk) __LDBL_REDIR2_DECL (obstack_printf_chk) diff --git a/libio/bits/stdio2-decl.h b/libio/bits/stdio2-decl.h index ada092ea..cf52c46c 100644 --- a/libio/bits/stdio2-decl.h +++ b/libio/bits/stdio2-decl.h @@ -66,6 +66,14 @@ extern int __vdprintf_chk (int __fd, int __flag, # ifdef __USE_GNU +extern char *__aprintf_chk (int __flag, + const char *__restrict __fmt, ...) + __THROW __attribute__ ((__format__ (__printf__, 2, 3))) + __attribute_malloc__; +extern char *__vaprintf_chk (int __flag, + const char *__restrict __fmt, __gnuc_va_list __ap) + __THROW __attribute__ ((__format__ (__printf__, 2, 0))) + __attribute_malloc__; extern int __asprintf_chk (char **__restrict __ptr, int __flag, const char *__restrict __fmt, ...) __THROW __attribute__ ((__format__ (__printf__, 3, 4))) __wur; diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h index 193494db..b9fed67e 100644 --- a/libio/bits/stdio2.h +++ b/libio/bits/stdio2.h @@ -200,6 +200,18 @@ vdprintf (int __fd, const char *__restrict __fmt, __gnuc_va_list __ap) # ifdef __USE_GNU # ifdef __va_arg_pack +__fortify_function char * +__NTH (aprintf (const char *__restrict __fmt, ...)) +{ + return __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ()); +} + +__fortify_function char * +__NTH (__aprintf (const char *__restrict __fmt, ...)) +{ + return __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ()); +} + __fortify_function int __NTH (asprintf (char **__restrict __ptr, const char *__restrict __fmt, ...)) { @@ -223,6 +235,26 @@ __NTH (obstack_printf (struct obstack *__restrict __obstack, __va_arg_pack ()); } # elif __fortify_use_clang +__fortify_function char * +__NTH (aprintf (const char *__restrict __fmt, ...)) +{ + __gnuc_va_list __fortify_ap; + __builtin_va_start (__fortify_ap, __fmt); + char * __p = __vaprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __fortify_ap); + __builtin_va_end (__fortify_ap); + return __p; +} + +__fortify_function char * +__NTH (__aprintf (const char *__restrict __fmt, ...)) +{ + __gnuc_va_list __fortify_ap; + __builtin_va_start (__fortify_ap, __fmt); + char *__p = __vaprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __fortify_ap); + __builtin_va_end (__fortify_ap); + return __p; +} + __fortify_function_error_function __attribute_overloadable__ int __NTH (asprintf (__fortify_clang_overload_arg (char **, __restrict, __ptr), const char *__restrict __fmt, ...)) @@ -260,6 +292,10 @@ __NTH (obstack_printf (__fortify_clang_overload_arg (struct obstack *, return __r; } # elif !defined __cplusplus +# define aprintf(...) \ + __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__) +# define __aprintf(...) \ + __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__) # define asprintf(ptr, ...) \ __asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__) # define __asprintf(ptr, ...) \ @@ -268,6 +304,12 @@ __NTH (obstack_printf (__fortify_clang_overload_arg (struct obstack *, __obstack_printf_chk (obstack, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__) # endif +__fortify_function char * +__NTH (vaprintf (const char *__restrict __fmt, __gnuc_va_list __ap)) +{ + return __vaprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __ap); +} + __fortify_function int __NTH (vasprintf (char **__restrict __ptr, const char *__restrict __fmt, __gnuc_va_list __ap)) diff --git a/libio/stdio.h b/libio/stdio.h index 3bf6a1f6..81d7176c 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -412,6 +412,19 @@ extern int asprintf (char **__restrict __ptr, __THROWNL __attribute__ ((__format__ (__printf__, 2, 3))) __wur; #endif +#ifdef __USE_GNU +/* Write formatted output to a string dynamically allocated with `malloc'. */ +extern char *vaprintf (const char *__restrict __fmt, __gnuc_va_list __ap) + __THROWNL __attribute__ ((__format__ (__printf__, 1, 0))) + __attribute_malloc__; +extern char *__aprintf (const char *__restrict __fmt, ...) + __THROWNL __attribute__ ((__format__ (__printf__, 1, 2))) + __attribute_malloc__; +extern char *aprintf (const char *__restrict __fmt, ...) + __THROWNL __attribute__ ((__format__ (__printf__, 1, 2))) + __attribute_malloc__; +#endif + #ifdef __USE_XOPEN2K8 /* Write formatted output to a file descriptor. */ extern int vdprintf (int __fd, const char *__restrict __fmt, diff --git a/libio/tst-aprintf.c b/libio/tst-aprintf.c new file mode 100644 index 00000000..e10eb591 --- /dev/null +++ b/libio/tst-aprintf.c @@ -0,0 +1,57 @@ +/* Test aprintf. + Copyright (C) 2026 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 +#include + +static int +do_test (void) +{ + char *buf; + + /* Success */ + buf = aprintf ("foo %d", 42); + TEST_COMPARE_STRING (buf, "foo 42"); + free(buf); + + { + /* Avoid -Wformat-overflow warning. */ + const char *volatile format = "%2000000000d %2000000000d"; + buf = aprintf (format, 1, 2); + TEST_VERIFY (buf == NULL); + } + if (errno != ENOMEM) + TEST_COMPARE (errno, EOVERFLOW); + + /* Force ENOMEM in the test below. */ + struct rlimit rl; + TEST_COMPARE (getrlimit (RLIMIT_AS, &rl), 0); + rl.rlim_cur = 10 * 1024 * 1024; + TEST_COMPARE (setrlimit (RLIMIT_AS, &rl), 0); + + buf = aprintf ("%20000000d", 1); + TEST_VERIFY (buf == NULL); + TEST_COMPARE (errno, ENOMEM); + + return 0; +} + +#include diff --git a/libio/vaprintf.c b/libio/vaprintf.c new file mode 100644 index 00000000..157f783d --- /dev/null +++ b/libio/vaprintf.c @@ -0,0 +1,39 @@ +/* Copyright (C) 2026 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 + . + + As a special exception, if you link the code in this file with + files compiled with a GNU compiler to produce an executable, + that does not cause the resulting executable to be covered by + the GNU Lesser General Public License. This exception does not + however invalidate any other reasons why the executable file + might be covered by the GNU Lesser General Public License. + This exception applies to code released by its copyright holders + in files containing the exception. */ + +#include +#include +#include +#include + +char * +__vaprintf (const char *fmt, va_list ap) +{ + char *p; + + return __vasprintf_internal (&p, fmt, ap, 0) < 0 ? NULL : p; +} +ldbl_weak_alias (__vaprintf, vaprintf) diff --git a/manual/stdio.texi b/manual/stdio.texi index c01feaed..e7deca78 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -2578,6 +2578,32 @@ other systems offer this function as an async-signal-safe alternative to The functions in this section do formatted output and place the results in dynamically allocated memory. +@deftypefun {char *} aprintf (const char *@var{template}, @dots{}) +@standards{GNU, stdio.h} +@safety{@prelim{}@mtsafe{@mtslocale{}}@asunsafe{@ascuheap{}}@acunsafe{@acsmem{}}} +This function is similar to @code{sprintf}, +except that it dynamically allocates a string +(as with @code{malloc}; @pxref{Unconstrained Allocation}) +to hold the output, +instead of putting the output in a buffer you allocate in advance. +A successful call to @code{aprintf} returns +a pointer to the newly allocated string. + +Here is how to use @code{aprintf} +to get the same result as the @code{snprintf} example, +but more easily: + +@smallexample +/* @r{Construct a message describing the value of a variable} + @r{whose name is @var{name} and whose value is @var{value}.} */ +char * +make_message (char *name, char *value) +@{ + return aprintf ("value of %s is %s", name, value); +@} +@end smallexample +@end deftypefun + @deftypefun int asprintf (char **@var{ptr}, const char *@var{template}, @dots{}) @standards{GNU, stdio.h} @safety{@prelim{}@mtsafe{@mtslocale{}}@asunsafe{@ascuheap{}}@acunsafe{@acsmem{}}} diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 21094483..9a26773e 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -89,6 +89,7 @@ routines := \ _fitoa_word \ _itoa \ _itowa \ + aprintf \ asprintf \ ctermid \ cuserid \ @@ -177,6 +178,7 @@ routines := \ # Exclude fortified routines from being built with _FORTIFY_SOURCE routines_no_fortify += \ + aprintf \ asprintf \ dprintf \ fprintf \ diff --git a/stdio-common/Versions b/stdio-common/Versions index 8e1cbf85..93d635ff 100644 --- a/stdio-common/Versions +++ b/stdio-common/Versions @@ -71,6 +71,9 @@ libc { __isoc23_sscanf; __isoc23_vsscanf; } + GLIBC_2.44 { + aprintf; + } GLIBC_PRIVATE { # global variables _itoa_lower_digits; diff --git a/stdio-common/aprintf.c b/stdio-common/aprintf.c new file mode 100644 index 00000000..bee49667 --- /dev/null +++ b/stdio-common/aprintf.c @@ -0,0 +1,40 @@ +/* Copyright (C) 2026 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 + +/* Write formatted output from FORMAT to a string which is + allocated with malloc. */ +/* VARARGS1 */ +char * +___aprintf (const char *fmt, ...) +{ + char *p; + va_list ap; + + va_start (ap, fmt); + if (__vasprintf_internal (&p, fmt, ap, 0) < 0) + p = NULL; + va_end (ap); + + return p; +} +ldbl_hidden_def (___aprintf, __aprintf) + +ldbl_strong_alias (___aprintf, __aprintf) +ldbl_weak_alias (___aprintf, aprintf) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 10ae73db..e0989a51 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -5,6 +5,7 @@ ldbl-extra-routines += fwscanf \ swscanf \ swprintf \ wscanf \ + vaprintf \ vasprintf \ vdprintf \ vscanf \ @@ -40,6 +41,7 @@ endif ifeq ($(subdir),stdio-common) ldbl-extra-routines += printf_size \ + aprintf \ asprintf \ dprintf \ fprintf \ @@ -250,12 +252,14 @@ $(objpfx)test-printf-size-ibm128.out: \ endif ifeq ($(subdir),debug) -ldbl-extra-routines += asprintf_chk \ +ldbl-extra-routines += aprintf_chk \ + asprintf_chk \ dprintf_chk \ fprintf_chk \ printf_chk \ snprintf_chk \ sprintf_chk \ + vaprintf_chk \ vasprintf_chk \ vdprintf_chk \ vfprintf_chk \ @@ -480,6 +484,7 @@ endif routines += $(foreach r,$(ldbl-extra-routines),ieee128-$(r)) routines_no_fortify += \ + ieee128-aprintf \ ieee128-asprintf \ ieee128-dprintf \ ieee128-fprintf \ @@ -490,6 +495,7 @@ routines_no_fortify += \ ieee128-sprintf \ ieee128-swprintf \ ieee128-syslog \ + ieee128-vaprintf \ ieee128-vasprintf \ ieee128-vdprintf \ ieee128-vfprintf \ diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions index 00c0b445..ae341658 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions @@ -301,4 +301,10 @@ libc { __isoc23_vswscanfieee128; __isoc23_vwscanfieee128; } + GLIBC_2.44 { + __aprintfieee128; + __vaprintfieee128; + __aprintf_chkieee128; + __vaprintf_chkieee128; + } } diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf.c new file mode 100644 index 00000000..041ebc01 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf.c @@ -0,0 +1,36 @@ +/* Wrapper for aprintf. IEEE128 version. + Copyright (C) 2026 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 + +extern char * +___ieee128___aprintf (const char *fmt, ...) +{ + va_list ap; + char *p; + + va_start (ap, fmt); + if (__vasprintf_internal (&p, fmt, ap, PRINTF_LDBL_USES_FLOAT128) < 0) + p = NULL; + va_end (ap); + + return p; +} +hidden_def (___ieee128___aprintf) +strong_alias (___ieee128___aprintf, __aprintfieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf_chk.c new file mode 100644 index 00000000..0e1e395d --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-aprintf_chk.c @@ -0,0 +1,40 @@ +/* Wrapper for __aprintf_chk. IEEE128 version. + Copyright (C) 2026 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 + +extern char * +___ieee128___aprintf_chk (int flag, const char *fmt, ...) +{ + va_list ap; + char *p; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + va_start (ap, fmt); + if (__vasprintf_internal (&p, fmt, ap, mode) < 0) + p = NULL; + va_end (ap); + + return p; +} +hidden_def (___ieee128___aprintf_chk) +strong_alias (___ieee128___aprintf_chk, __aprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf.c new file mode 100644 index 00000000..6157f306 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf.c @@ -0,0 +1,29 @@ +/* Wrapper for vaprintf. IEEE128 version. + Copyright (C) 2026 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 + +extern char * +___ieee128_vaprintf (const char *fmt, va_list ap) +{ + char *p; + if (__vasprintf_internal (&p, fmt, ap, PRINTF_LDBL_USES_FLOAT128) < 0) + p = NULL; + return p; +} +strong_alias (___ieee128_vaprintf, __vaprintfieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf_chk.c new file mode 100644 index 00000000..4fd0ca8c --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vaprintf_chk.c @@ -0,0 +1,31 @@ +/* Wrapper for __vaprintf_chk. IEEE128 version. + Copyright (C) 2026 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 + +extern char * +___ieee128___vaprintf_chk (int flag, const char *fmt, va_list ap) +{ + char *p; + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vasprintf_internal (&p, fmt, ap, mode) < 0 ? NULL : p; +} +strong_alias (___ieee128___vaprintf_chk, __vaprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c index 597e782e..92cdafd3 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c @@ -29,12 +29,24 @@ static void do_test_call_varg (FILE *stream, const char *format, ...) { - char *buffer = NULL; + char *buffer; char string[128]; int res; va_list args; + printf ("%20s", "__vaprintf_chk: "); + va_start (args, format); + buffer = __vaprintf_chk (1, format, args); + va_end (args); + if (buffer == NULL) + printf ("Error using vaprintf\n"); + else + printf ("%s", buffer); + free (buffer); + printf ("\n"); + printf ("%20s", "__vasprintf_chk: "); + buffer = NULL; va_start (args, format); res = __vasprintf_chk (&buffer, 1, format, args); va_end (args); @@ -86,11 +98,21 @@ static void do_test_call_rarg (FILE *stream, const char *format, long double ld, double d) { - char *buffer = NULL; + char *buffer; char string[128]; int res; + printf ("%20s", "__aprintf_chk: "); + buffer = __aprintf_chk (1, format, ld, d); + if (buffer == NULL) + printf ("Error using aprintf\n"); + else + printf ("%s", buffer); + free (buffer); + printf ("\n"); + printf ("%20s", "__asprintf_chk: "); + buffer = NULL; res = __asprintf_chk (&buffer, 1, format, ld, d); if (res == -1) printf ("Error using vasprintf\n"); @@ -153,30 +175,35 @@ do_test (void) /* Compare against the expected output. */ const char *expected = + " __aprintf_chk: -1.0000000000, -1.0000000000\n" " __asprintf_chk: -1.0000000000, -1.0000000000\n" " __dprintf_chk: -1.0000000000, -1.0000000000\n" " __fprintf_chk: -1.0000000000, -1.0000000000\n" " __printf_chk: -1.0000000000, -1.0000000000\n" " __snprintf_chk: -1.0000000000, -1.0000000000\n" " __sprintf_chk: -1.0000000000, -1.0000000000\n" + " __vaprintf_chk: -1.0000000000, -1.0000000000\n" " __vasprintf_chk: -1.0000000000, -1.0000000000\n" " __vdprintf_chk: -1.0000000000, -1.0000000000\n" " __vfprintf_chk: -1.0000000000, -1.0000000000\n" " __vprintf_chk: -1.0000000000, -1.0000000000\n" " __vsnprintf_chk: -1.0000000000, -1.0000000000\n" " __vsprintf_chk: -1.0000000000, -1.0000000000\n" + " __aprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __asprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __dprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __fprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __printf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __snprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __sprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " __vaprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vasprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vdprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vfprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vsnprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vsprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " __vaprintf_chk: 3.000000, 2.000000, 1.000000\n" " __vasprintf_chk: 3.000000, 2.000000, 1.000000\n" " __vdprintf_chk: 3.000000, 2.000000, 1.000000\n" " __vfprintf_chk: 3.000000, 2.000000, 1.000000\n" diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c index e762e962..7629ee7b 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c @@ -27,12 +27,24 @@ static void do_test_call_varg (FILE *stream, const char *format, ...) { - char *buffer = NULL; + char *buffer; char string[128]; va_list args; int ret; + printf ("%15s", "vaprintf: "); + va_start (args, format); + buffer = vaprintf (format, args); + va_end (args); + if (buffer == NULL) + printf ("Error using vaprintf\n"); + else + printf ("%s", buffer); + free (buffer); + printf ("\n"); + printf ("%15s", "vasprintf: "); + buffer = NULL; va_start (args, format); ret = vasprintf (&buffer, format, args); va_end (args); @@ -81,11 +93,21 @@ do_test_call_varg (FILE *stream, const char *format, ...) static void do_test_call_rarg (FILE *stream, const char *format, long double ld, double d) { - char *buffer = NULL; + char *buffer; char string[128]; int ret; + printf ("%15s", "aprintf: "); + buffer = aprintf (format, ld, d); + if (buffer == NULL) + printf ("Error using aprintf\n"); + else + printf ("%s", buffer); + free (buffer); + printf ("\n"); + printf ("%15s", "asprintf: "); + buffer = NULL; ret = asprintf (&buffer, format, ld, d); if (ret == -1 || buffer == NULL) printf ("Error using asprintf\n"); @@ -146,30 +168,35 @@ do_test (void) /* Compare against the expected output. */ const char *expected = + " aprintf: -1.0000000000, -1.0000000000\n" " asprintf: -1.0000000000, -1.0000000000\n" " dprintf: -1.0000000000, -1.0000000000\n" " fprintf: -1.0000000000, -1.0000000000\n" " printf: -1.0000000000, -1.0000000000\n" " snprintf: -1.0000000000, -1.0000000000\n" " sprintf: -1.0000000000, -1.0000000000\n" + " vaprintf: -1.0000000000, -1.0000000000\n" " vasprintf: -1.0000000000, -1.0000000000\n" " vdprintf: -1.0000000000, -1.0000000000\n" " vfprintf: -1.0000000000, -1.0000000000\n" " vprintf: -1.0000000000, -1.0000000000\n" " vsnprintf: -1.0000000000, -1.0000000000\n" " vsprintf: -1.0000000000, -1.0000000000\n" + " aprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " asprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " dprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " fprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " printf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " snprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " sprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " vaprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vasprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vdprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vfprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vsnprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vsprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " vaprintf: 3.000000, 2.000000, 1.000000\n" " vasprintf: 3.000000, 2.000000, 1.000000\n" " vdprintf: 3.000000, 2.000000, 1.000000\n" " vfprintf: 3.000000, 2.000000, 1.000000\n" diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile index ef7da1f8..3effc4ef 100644 --- a/sysdeps/ieee754/ldbl-opt/Makefile +++ b/sysdeps/ieee754/ldbl-opt/Makefile @@ -15,6 +15,8 @@ libnldbl-calls = \ acos \ acosh \ acospi \ + aprintf \ + aprintf_chk \ asin \ asinh \ asinpi \ @@ -223,6 +225,8 @@ libnldbl-calls = \ trunc \ ufromfp \ ufromfpx \ + vaprintf \ + vaprintf_chk \ vasprintf \ vasprintf_chk \ vdprintf \ @@ -556,6 +560,7 @@ CFLAGS-tst-nldbl-wscanf-binary-gnu89.c += -mlong-double-64 -std=gnu89 \ endif routines_no_fortify += \ + nldbl-aprintf \ nldbl-asprintf \ nldbl-dprintf \ nldbl-fprintf \ @@ -567,6 +572,7 @@ routines_no_fortify += \ nldbl-sprintf \ nldbl-swprintf \ nldbl-syslog \ + nldbl-vaprintf \ nldbl-vasprintf \ nldbl-vdprintf \ nldbl-vfprintf \ diff --git a/sysdeps/ieee754/ldbl-opt/Versions b/sysdeps/ieee754/ldbl-opt/Versions index 5345f1c6..f7dec42d 100644 --- a/sysdeps/ieee754/ldbl-opt/Versions +++ b/sysdeps/ieee754/ldbl-opt/Versions @@ -98,6 +98,16 @@ libc { __nldbl___isoc23_vfwscanf; __nldbl___isoc23_vswscanf; } + GLIBC_2.44 { + __aprintf; + aprintf; + vaprintf; + __nldbl___aprintf; + __nldbl_aprintf; + __nldbl_vaprintf; + __nldbl___aprintf_chk; + __nldbl___vaprintf_chk; + } } libm { NLDBL_VERSION { diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-aprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-aprintf.c new file mode 100644 index 00000000..fe250c03 --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/nldbl-aprintf.c @@ -0,0 +1,17 @@ +#include "nldbl-compat.h" + +attribute_hidden +char * +__aprintf (const char *fmt, ...) +{ + va_list ap; + char *p; + + va_start (ap, fmt); + p = __nldbl_vaprintf (fmt, ap); + va_end (ap); + + return p; +} +extern __typeof (__aprintf) aprintf attribute_hidden; +weak_alias (__aprintf, aprintf) diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-aprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-aprintf_chk.c new file mode 100644 index 00000000..77b1d221 --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/nldbl-aprintf_chk.c @@ -0,0 +1,15 @@ +#include "nldbl-compat.h" + +attribute_hidden +char * +__aprintf_chk (int flag, const char *fmt, ...) +{ + va_list ap; + char *p; + + va_start (ap, fmt); + p = __nldbl___vaprintf_chk (flag, fmt, ap); + va_end (ap); + + return p; +} diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c index dcd56492..d5a09f74 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c @@ -55,6 +55,22 @@ libc_hidden_proto (__nldbl___isoc23_vfwscanf) we don't need to split this into one file per function for the sake of statically linked programs. */ +int +attribute_compat_text_section +__nldbl___aprintf (const char *fmt, ...) +{ + va_list ap; + char *p; + + va_start (ap, fmt); + if (__vasprintf_internal (&p, fmt, ap, PRINTF_LDBL_IS_DBL) < 0) + p = NULL; + va_end (ap); + + return p; +} +weak_alias (__nldbl___aprintf, __nldbl_aprintf) + int attribute_compat_text_section __nldbl___asprintf (char **string_ptr, const char *fmt, ...) @@ -208,6 +224,14 @@ __nldbl_swprintf (wchar_t *s, size_t n, const wchar_t *fmt, ...) return ret; } +char * +attribute_compat_text_section weak_function +__nldbl_vaprintf (const char *fmt, va_list ap) +{ + char *p; + return __vasprintf_internal (&p, fmt, ap, PRINTF_LDBL_IS_DBL) < 0 ? NULL : p; +} + int attribute_compat_text_section weak_function __nldbl_vasprintf (char **result_ptr, const char *fmt, va_list ap) @@ -649,6 +673,36 @@ __nldbl___wprintf_chk (int flag, const wchar_t *fmt, ...) return ret; } +char * +attribute_compat_text_section +__nldbl___vaprintf_chk (int flag, const char *fmt, va_list ap) +{ + char *p; + unsigned int mode = PRINTF_LDBL_IS_DBL; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vasprintf_internal (&p, fmt, ap, mode) < 0 ? NULL : p; +} + +char * +attribute_compat_text_section +__nldbl___aprintf_chk (int flag, const char *fmt, ...) +{ + va_list ap; + char *p; + unsigned int mode = PRINTF_LDBL_IS_DBL; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + va_start (ap, fmt); + if (__vasprintf_internal (&p, fmt, ap, mode) < 0) + p = NULL; + va_end (ap); + + return p; +} + int attribute_compat_text_section __nldbl___vasprintf_chk (char **ptr, int flag, const char *fmt, va_list ap) @@ -1336,3 +1390,8 @@ compat_symbol (libc, __nldbl___fprintf_chk, __fprintf_chk, GLIBC_2_3_4); compat_symbol (libc, __nldbl___vprintf_chk, __vprintf_chk, GLIBC_2_3_4); compat_symbol (libc, __nldbl___vfprintf_chk, __vfprintf_chk, GLIBC_2_3_4); #endif +#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_4_4) +compat_symbol (libc, __nldbl_aprintf, aprintf, GLIBC_2_4_4); +compat_symbol (libc, __nldbl_vaprintf, vaprintf, GLIBC_2_4_4); +compat_symbol (libc, __nldbl___aprintf, __aprintf, GLIBC_2_4_4); +#endif diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.h b/sysdeps/ieee754/ldbl-opt/nldbl-compat.h index f2217789..9da1c2d2 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.h +++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.h @@ -46,6 +46,7 @@ NLDBL_DECL (_IO_vfscanf); NLDBL_DECL (vfscanf); NLDBL_DECL (vfwscanf); NLDBL_DECL (obstack_vprintf); +NLDBL_DECL (vaprintf); NLDBL_DECL (vasprintf); NLDBL_DECL (dprintf); NLDBL_DECL (vdprintf); @@ -57,6 +58,8 @@ NLDBL_DECL (vsprintf); NLDBL_DECL (vsscanf); NLDBL_DECL (vswprintf); NLDBL_DECL (vswscanf); +NLDBL_DECL (__aprintf); +NLDBL_DECL (aprintf); NLDBL_DECL (__asprintf); NLDBL_DECL (asprintf); NLDBL_DECL (__printf_fp); @@ -126,6 +129,8 @@ extern int __nldbl___vsnprintf_chk (char *__restrict, size_t, int, size_t, extern int __nldbl___vswprintf_chk (wchar_t *__restrict, size_t, int, size_t, const wchar_t *__restrict, __gnuc_va_list) __THROW; +extern char *__nldbl___vaprintf_chk (int, const char *, __gnuc_va_list) + __THROW __attribute_malloc__; extern int __nldbl___vasprintf_chk (char **, int, const char *, __gnuc_va_list) __THROW; extern int __nldbl___vdprintf_chk (int, int, const char *, __gnuc_va_list); diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vaprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vaprintf.c new file mode 100644 index 00000000..6ba7789c --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/nldbl-vaprintf.c @@ -0,0 +1,9 @@ +#include "nldbl-compat.h" + +attribute_hidden +weak_function +char * +vaprintf (const char *fmt, va_list ap) +{ + return __nldbl_vaprintf (fmt, ap); +} diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vaprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vaprintf_chk.c new file mode 100644 index 00000000..72e4fca7 --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/nldbl-vaprintf_chk.c @@ -0,0 +1,8 @@ +#include "nldbl-compat.h" + +attribute_hidden +char * +__vaprintf_chk (int flag, const char *fmt, va_list ap) +{ + return __nldbl___vaprintf_chk (flag, fmt, ap); +} diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 08dcd85c..bba34658 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -2760,6 +2760,11 @@ GLIBC_2.43 tss_delete F GLIBC_2.43 tss_get F GLIBC_2.43 tss_set F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index c17d5399..19d193cd 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -2437,6 +2437,11 @@ GLIBC_2.43 tss_delete F GLIBC_2.43 tss_get F GLIBC_2.43 tss_set F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F HURD_CTHREADS_0.3 __mutex_init F HURD_CTHREADS_0.3 __mutex_lock F HURD_CTHREADS_0.3 __mutex_trylock F diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 3156688a..1dfc4868 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2775,3 +2775,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 8af5b0b5..bd8456cb 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -3122,6 +3122,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 35fcef2c..cc608a70 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -2536,3 +2536,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index a6c6b951..8bb4c76c 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -2828,6 +2828,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index e76015fe..84ce598d 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -2825,6 +2825,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist index 1fb7cdca..a431ad7d 100644 --- a/sysdeps/unix/sysv/linux/csky/libc.abilist +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist @@ -2812,3 +2812,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist index 0710ccec..cec2ae38 100644 --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist @@ -2849,6 +2849,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index 3afe3a88..443b553c 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -3032,6 +3032,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist b/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist index c2b3a66d..69119490 100644 --- a/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist +++ b/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist @@ -2296,3 +2296,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index d6855131..b57426de 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -2808,6 +2808,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index 4e3fe9c4..d0630627 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -2975,6 +2975,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist index 29f0c5f9..cf9b9fee 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist @@ -2861,3 +2861,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist index 2ef62838..5699f65a 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist @@ -2858,3 +2858,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index 031e8961..3dd79859 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -2938,6 +2938,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 8dc99d81..4acff6b7 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -2936,6 +2936,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index 054c5b63..c0ae4197 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -2944,6 +2944,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 13f0148b..63c62110 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -2846,6 +2846,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/or1k/libc.abilist b/sysdeps/unix/sysv/linux/or1k/libc.abilist index e7ffe07d..a3b89d62 100644 --- a/sysdeps/unix/sysv/linux/or1k/libc.abilist +++ b/sysdeps/unix/sysv/linux/or1k/libc.abilist @@ -2286,3 +2286,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist index dea4b20f..fa44aa46 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist @@ -3165,6 +3165,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist index b45e1274..5657ea76 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist @@ -3210,6 +3210,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 942cf6a0..233c5f0b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -2919,6 +2919,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 65d78e50..c48eb3ed 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -2995,3 +2995,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist index dcab30d7..ae677eb8 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist @@ -2539,3 +2539,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist index 796ef35e..734e5409 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist @@ -2739,3 +2739,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 9bd9f5eb..2ca245ba 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -3163,6 +3163,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 8f2350ee..f6f9c998 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -2956,6 +2956,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist index 7aa98c5a..100b5de7 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist @@ -2855,6 +2855,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist index 6bd4f8f6..f16c9e83 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist @@ -2852,6 +2852,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index b52cab2a..fa79c7b9 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -3186,6 +3186,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index ff99cd4f..becd745b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -2822,6 +2822,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 306cd627..a3fefbc5 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -2771,6 +2771,11 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 8b9c4487..659654d9 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -2790,3 +2790,8 @@ GLIBC_2.43 memset_explicit F GLIBC_2.43 mseal F GLIBC_2.43 openat2 F GLIBC_2.43 umaxabs F +GLIBC_2.44 __aprintf F +GLIBC_2.44 __aprintf_chk F +GLIBC_2.44 __vaprintf_chk F +GLIBC_2.44 aprintf F +GLIBC_2.44 vaprintf F From patchwork Wed Apr 22 18:38:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 133704 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 365094331BF4 for ; Wed, 22 Apr 2026 18:57:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 365094331BF4 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=DL0YETGD X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by sourceware.org (Postfix) with ESMTPS id 8D6F742ACFCF for ; Wed, 22 Apr 2026 18:38:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8D6F742ACFCF Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8D6F742ACFCF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883084; cv=none; b=q8kob9hykcghadrb89RE8Asf9zzKIq+KyF/hHv8u82ZEmhstXN6MGN/xwcFUBEj2qCMYB3rjuJ/LKO9h2aDaczYePWGairm5Ri0o6A6fM5LNZG71/yMveZIErhXR/EG3TXrEfqmEXUWUqVHgMPVZgslR05AYM3HQn6WBSUEtxj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883084; c=relaxed/simple; bh=EZ/H9xyt77P5+NsOB/rSSC6qIH3qGLiuF1/Fy0HdrPs=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=dzY6lR/o5AY4Tkipy/LjeVrBHvc99kfcyqVuxay0ZdsbwMZ0463SYNMIiroSBzhzY8csxlmpAaymOikru+/VmgVYZ0ZPwcAxYiWYok3s1OzVE9WD11q0L7fwQpxc781XCeqFAIqs+dnWbkmndAnW2qmSAGWey2P0tbJ6GRn1HPY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D6F742ACFCF Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id E73CA440E2; Wed, 22 Apr 2026 18:38:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C162DC19425; Wed, 22 Apr 2026 18:38:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776883083; bh=EZ/H9xyt77P5+NsOB/rSSC6qIH3qGLiuF1/Fy0HdrPs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DL0YETGD/nR1wMw5NxsyJTjj8OOYtkW9iA2TiFbl6p9cqS5tQ3+KDxYyMXwfImP8I tSOO1vtfT8Ne4ifQoBgZE9Ym57OwizJsAbXH326ufI6vjzwC8WXarwX7FjXDEiwZzH r6sCXYBV4L+i3W43HxswZB66WOgHI9FuS2nnAN1ghxHe5wijb8w/Dwrty/QyI+4InM xWbmNOsJT6IQGdyRvnW5uBmiyokxqRiv5MmWYiLEtjhRFMO75lafhZHCZX4c6b739b yOlbhSSKLg1CJ9fY4+qi5LZnlTZjU8Fq8WmnrBB1WHyhOtO7qkc2PZhk0IK1Ilsegz pKNTb5D3hu3aw== Date: Wed, 22 Apr 2026 20:38:00 +0200 From: Alejandro Colomar To: libc-alpha@sourceware.org Cc: Alejandro Colomar , Joseph Myers , Paul Eggert , Adhemerval Zanella Netto , Florian Weimer , "Dmitry V. Levin" , Archie Cobbs , Solar Designer , Sam James Subject: [PATCH 2/3] manual/: Prefer aprintf(3) over asprintf(3) Message-ID: <7ad3070944954bca1b727e8d2423805d9bbd3533.1776882798.git.alx@kernel.org> X-Mailer: git-send-email 2.53.0 References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org While it's less portable at the moment, it's a better API (simpler, safer, and less error-prone). The C Committee has expressed strong support for this API, intending to standardize it. Thus, it should be more portable in the long term. Signed-off-by: Alejandro Colomar --- manual/examples/rprintf.c | 4 ++-- manual/stdio.texi | 4 ++-- manual/string.texi | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manual/examples/rprintf.c b/manual/examples/rprintf.c index 734a8768..736ac169 100644 --- a/manual/examples/rprintf.c +++ b/manual/examples/rprintf.c @@ -38,8 +38,8 @@ print_widget (FILE *stream, /* Format the output into a string. */ w = *((const Widget **) (args[0])); - len = asprintf (&buffer, "", w, w->name); - if (len == -1) + buffer = aprintf ("", w, w->name); + if (buffer == NULL) return -1; /* Pad to the minimum field width and print to the stream. */ diff --git a/manual/stdio.texi b/manual/stdio.texi index e7deca78..91149626 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -2458,7 +2458,7 @@ because it can potentially output more characters than can fit in the allocation size of the string @var{s}. Remember that the field width given in a conversion specification is only a @emph{minimum} value. -To avoid this problem, you can use @code{snprintf} or @code{asprintf}, +To avoid this problem, you can use @code{snprintf} or @code{aprintf}, described below. @end deftypefun @@ -2543,7 +2543,7 @@ make_message (char *name, char *value) @end group @end smallexample -In practice, it is often easier just to use @code{asprintf}, below. +In practice, it is often easier just to use @code{aprintf}, below. @strong{Attention:} In versions of @theglibc{} prior to 2.1 the return value is the number of characters stored, not including the diff --git a/manual/string.texi b/manual/string.texi index 24004f1f..7a6ee12a 100644 --- a/manual/string.texi +++ b/manual/string.texi @@ -1198,7 +1198,7 @@ strings to fit arbitrary size limits. @xref{Semantics, , Writing Robust Programs, standards, The GNU Coding Standards}. Instead of string-truncation functions, it is usually better to use dynamic memory allocation (@pxref{Unconstrained Allocation}) and functions -such as @code{strdup} or @code{asprintf} to construct strings. +such as @code{strdup} or @code{aprintf} to construct strings. @node String/Array Comparison @section String/Array Comparison From patchwork Wed Apr 22 18:38:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 133703 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 195F443351A6 for ; Wed, 22 Apr 2026 18:56:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 195F443351A6 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=GL+418li X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) by sourceware.org (Postfix) with ESMTPS id 49BE042ACFD8 for ; Wed, 22 Apr 2026 18:38:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 49BE042ACFD8 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 49BE042ACFD8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2600:3c04:e001:324:0:1991:8:25 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883090; cv=none; b=um1xKr7WxnxprcRDpYATWGb0RXcP144E8EEa6bRmbdEmfm6vSkux66rZPynA5jHJ7on807k+7RJSBI9cqC9ZBXKccDfXWk1Dqgh/Or9IvrGZ8HzKaklQRAU8/3GLe1xWGWOBIXVjaXeogE+h2tdbC12LgCizmj+7SgqiTbOVfSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883090; c=relaxed/simple; bh=79eqXMOheoYY4UIkbRmN6NYfP8bqahBi/wU9OD48szQ=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=vRi+HUbvTpOq5e3uZSjmDn7bXqgYCQyybxBIhj0G+leCm9orc/i3OE1+lT7yLcjmj5BL/jSoeYznJk5S8u4X8xKQ10COydfxt4agjNrvD7aUYUF+nokWux5/dFe2tVfvgLkqUZm8QGKYWjJ/Ovw0v0FaUYfC9YOKNhgWNkEFdQE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 49BE042ACFD8 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 2304B61868; Wed, 22 Apr 2026 18:38:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C440DC19425; Wed, 22 Apr 2026 18:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776883087; bh=79eqXMOheoYY4UIkbRmN6NYfP8bqahBi/wU9OD48szQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GL+418liJRfFWdYPB1vxBjfpWzu2bln3R+mY9UzwI55Wq/acSzba4YPgpqtSiRn/O J5nZexcRDWtqeesMJlsab0TqiuyWPF+1ks3wC0X1yXomuLThKiMDcTFhinnRPFgPuI sHtAV07nlrsTyQ3c2tMXzSEMeT3rzdzneuKQ+Bt8WNv8YPI+v+jrssxtViJyqkyn0G Srq2dvW/nzxj9QkdNDVGl1x/405/DCC4vS/43GVYsxMuH7D2+ly49Ax1mImrJV6rZ8 3XlkIbKY7GmCTCtMVDwWx8kgiW9wa3S0z2RcA93ffQaW7E0Sx6TNs7WQKhGTS7IGpA PliucpAKw0WOw== Date: Wed, 22 Apr 2026 20:38:04 +0200 From: Alejandro Colomar To: libc-alpha@sourceware.org Cc: Alejandro Colomar , Joseph Myers , Paul Eggert , Adhemerval Zanella Netto , Florian Weimer , "Dmitry V. Levin" , Archie Cobbs , Solar Designer , Sam James Subject: [PATCH 3/3] sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c: Fix typo Message-ID: <22c4ae3f7e5a80aa3ac118a909fe5a07c7808d03.1776882798.git.alx@kernel.org> X-Mailer: git-send-email 2.53.0 References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Signed-off-by: Alejandro Colomar --- .../ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c index 92cdafd3..aa86741b 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c @@ -115,7 +115,7 @@ do_test_call_rarg (FILE *stream, const char *format, long double ld, buffer = NULL; res = __asprintf_chk (&buffer, 1, format, ld, d); if (res == -1) - printf ("Error using vasprintf\n"); + printf ("Error using asprintf\n"); if (buffer == NULL) printf ("Error using asprintf\n"); else