From: Bruno Haible Date: Sun, 30 Jun 2024 18:58:29 +0000 (+0200) Subject: zprintf: New module. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b11765b65676024dab0f3ac16f7a0a2cf911494f;p=gnulib.git zprintf: New module. * lib/stdio.in.h (zprintf): New declaration. * lib/zprintf.c: New file, based on lib/vzprintf.c. * m4/stdio_h.m4 (gl_STDIO_H_REQUIRE_DEFAULTS): Initialize GNULIB_ZPRINTF. * modules/stdio (Makefile.am): Substitute GNULIB_ZPRINTF. * modules/zprintf: New file. --- diff --git a/ChangeLog b/ChangeLog index 62041cd616..3b6f777e85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2024-06-30 Bruno Haible + + zprintf: New module. + * lib/stdio.in.h (zprintf): New declaration. + * lib/zprintf.c: New file, based on lib/vzprintf.c. + * m4/stdio_h.m4 (gl_STDIO_H_REQUIRE_DEFAULTS): Initialize + GNULIB_ZPRINTF. + * modules/stdio (Makefile.am): Substitute GNULIB_ZPRINTF. + * modules/zprintf: New file. + 2024-06-30 Bruno Haible vprintf-posix: Document properly. diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 51876b2455..013c7a4ad1 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1265,6 +1265,20 @@ _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " # endif #endif +#if @GNULIB_ZPRINTF@ +/* Prints formatted output to standard output. + Returns the number of bytes written to standard output. Upon failure, + returns -1 with stdout's error indicator set. + Failure cause EOVERFLOW can only occur when a width > INT_MAX is used. + Therefore, if the format string is valid and does not use %ls/%lc + directives nor widths, the only possible failure causes are ENOMEM + and the possible failure causes from fwrite(). */ +_GL_FUNCDECL_SYS (zprintf, off64_t, (const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_SYS (zprintf, off64_t, (const char *restrict format, ...)); +#endif + #if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@ # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \ || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)) diff --git a/lib/zprintf.c b/lib/zprintf.c new file mode 100644 index 0000000000..b5a383a7c8 --- /dev/null +++ b/lib/zprintf.c @@ -0,0 +1,37 @@ +/* Formatted output to standard output. + Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. + + This file 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 3 of the + License, or (at your option) any later version. + + This file 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 this program. If not, see . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include + +#include + +off64_t +zprintf (const char *format, ...) +{ + va_list args; + off64_t ret; + + va_start (args, format); + ret = vfzprintf (stdout, format, args); + va_end (args); + + return ret; +} diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index a0e1c3caed..ec52ae92ff 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ # stdio_h.m4 -# serial 74 +# serial 75 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -197,6 +197,7 @@ AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSZPRINTF]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VZPRINTF]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ZPRINTF]) dnl Support Microsoft deprecated alias function names by default. gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) diff --git a/modules/stdio b/modules/stdio index 69ab95dd37..0e6b6e4d21 100644 --- a/modules/stdio +++ b/modules/stdio @@ -132,6 +132,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ -e 's/@''GNULIB_VSZPRINTF''@/$(GNULIB_VSZPRINTF)/g' \ -e 's/@''GNULIB_VZPRINTF''@/$(GNULIB_VZPRINTF)/g' \ + -e 's/@''GNULIB_ZPRINTF''@/$(GNULIB_ZPRINTF)/g' \ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ diff --git a/modules/zprintf b/modules/zprintf new file mode 100644 index 0000000000..d4acca6355 --- /dev/null +++ b/modules/zprintf @@ -0,0 +1,25 @@ +Description: +zprintf() function: print formatted output (without INT_MAX limitation) +to standard output + +Files: +lib/zprintf.c + +Depends-on: +stdio +vfzprintf + +configure.ac: +gl_STDIO_MODULE_INDICATOR([zprintf]) + +Makefile.am: +lib_SOURCES += zprintf.c + +Include: + + +License: +LGPL + +Maintainer: +all