From: Bruno Haible Date: Fri, 27 Dec 2024 22:24:51 +0000 (+0100) Subject: Rename module stdio to stdio-h. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95257716bb8f617a4c7e9353f328a4e2d4015f0;p=thirdparty%2Fgnulib.git Rename module stdio to stdio-h. * modules/stdio-h: Renamed from modules/stdio. * modules/stdio-h-tests: Renamed from modules/stdio-tests. * modules/stdio-h-c++-tests: Renamed from modules/stdio-c++-tests. * tests/test-stdio-h.c: Renamed from tests/test-stdio.c. * tests/test-stdio-h-c++.cc: Renamed from tests/test-stdio-c++.cc. * tests/test-stdio-h-c++2.cc: Renamed from tests/test-stdio-c++2.cc. * doc/posix-headers/stdio.texi: Update. * doc/posix-functions/fgetc.texi: Update. * doc/posix-functions/fgets.texi: Update. * doc/posix-functions/fprintf.texi: Update. * doc/posix-functions/fputc.texi: Update. * doc/posix-functions/fputs.texi: Update. * doc/posix-functions/fread.texi: Update. * doc/posix-functions/fscanf.texi: Update. * doc/posix-functions/fwrite.texi: Update. * doc/posix-functions/getc.texi: Update. * doc/posix-functions/getchar.texi: Update. * doc/posix-functions/printf.texi: Update. * doc/posix-functions/putc.texi: Update. * doc/posix-functions/putchar.texi: Update. * doc/posix-functions/puts.texi: Update. * doc/posix-functions/read.texi: Update. * doc/posix-functions/scanf.texi: Update. * doc/posix-functions/vfprintf.texi: Update. * doc/posix-functions/vprintf.texi: Update. * doc/posix-functions/write.texi: Update. * modules/* (Depends-on): Update. * modules/stdio: New file. --- diff --git a/ChangeLog b/ChangeLog index 8a58b0f233..dbb65d5dd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2024-12-27 Bruno Haible + + Rename module stdio to stdio-h. + * modules/stdio-h: Renamed from modules/stdio. + * modules/stdio-h-tests: Renamed from modules/stdio-tests. + * modules/stdio-h-c++-tests: Renamed from modules/stdio-c++-tests. + * tests/test-stdio-h.c: Renamed from tests/test-stdio.c. + * tests/test-stdio-h-c++.cc: Renamed from tests/test-stdio-c++.cc. + * tests/test-stdio-h-c++2.cc: Renamed from tests/test-stdio-c++2.cc. + * doc/posix-headers/stdio.texi: Update. + * doc/posix-functions/fgetc.texi: Update. + * doc/posix-functions/fgets.texi: Update. + * doc/posix-functions/fprintf.texi: Update. + * doc/posix-functions/fputc.texi: Update. + * doc/posix-functions/fputs.texi: Update. + * doc/posix-functions/fread.texi: Update. + * doc/posix-functions/fscanf.texi: Update. + * doc/posix-functions/fwrite.texi: Update. + * doc/posix-functions/getc.texi: Update. + * doc/posix-functions/getchar.texi: Update. + * doc/posix-functions/printf.texi: Update. + * doc/posix-functions/putc.texi: Update. + * doc/posix-functions/putchar.texi: Update. + * doc/posix-functions/puts.texi: Update. + * doc/posix-functions/read.texi: Update. + * doc/posix-functions/scanf.texi: Update. + * doc/posix-functions/vfprintf.texi: Update. + * doc/posix-functions/vprintf.texi: Update. + * doc/posix-functions/write.texi: Update. + * modules/* (Depends-on): Update. + * modules/stdio: New file. + 2024-12-27 Bruno Haible Rename module stdint to stdint-h. diff --git a/doc/posix-functions/fgetc.texi b/doc/posix-functions/fgetc.texi index 8240f925de..3740856c47 100644 --- a/doc/posix-functions/fgetc.texi +++ b/doc/posix-functions/fgetc.texi @@ -4,11 +4,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgetc.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/fgets.texi b/doc/posix-functions/fgets.texi index a66c3d1718..287c55a209 100644 --- a/doc/posix-functions/fgets.texi +++ b/doc/posix-functions/fgets.texi @@ -4,11 +4,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgets.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/fprintf.texi b/doc/posix-functions/fprintf.texi index 5d6063300f..5509008d82 100644 --- a/doc/posix-functions/fprintf.texi +++ b/doc/posix-functions/fprintf.texi @@ -4,10 +4,10 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html} -Gnulib module: fprintf-posix or fprintf-gnu or stdio, nonblocking, sigpipe +Gnulib module: fprintf-posix or fprintf-gnu or stdio-h, nonblocking, sigpipe @mindex fprintf-posix @mindex fprintf-gnu -@mindex stdio +@mindex stdio-h @mindex nonblocking @mindex sigpipe @@ -104,7 +104,7 @@ glibc when used with @code{_FORTIFY_SOURCE >= 2} (set by default on Ubuntu), macOS 14, OpenBSD, MSVC 14, Android. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{fprintf-posix} or @code{fprintf-gnu}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{fprintf-posix} or @code{fprintf-gnu}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -113,7 +113,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{fprintf-posix} or @code{fprintf-gnu}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{fprintf-posix} or @code{fprintf-gnu}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/fputc.texi b/doc/posix-functions/fputc.texi index f10735c958..de80da596c 100644 --- a/doc/posix-functions/fputc.texi +++ b/doc/posix-functions/fputc.texi @@ -4,12 +4,12 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputc.html} -Gnulib module: stdio, nonblocking, sigpipe -@mindex stdio +Gnulib module: stdio-h, nonblocking, sigpipe +@mindex stdio-h @mindex nonblocking @mindex sigpipe -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -18,7 +18,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/fputs.texi b/doc/posix-functions/fputs.texi index f623e9f1fd..e8808312cc 100644 --- a/doc/posix-functions/fputs.texi +++ b/doc/posix-functions/fputs.texi @@ -4,12 +4,12 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputs.html} -Gnulib module: stdio, nonblocking, sigpipe -@mindex stdio +Gnulib module: stdio-h, nonblocking, sigpipe +@mindex stdio-h @mindex nonblocking @mindex sigpipe -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -18,7 +18,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/fread.texi b/doc/posix-functions/fread.texi index 6929238ab8..1ddf757041 100644 --- a/doc/posix-functions/fread.texi +++ b/doc/posix-functions/fread.texi @@ -4,11 +4,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fread.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/fscanf.texi b/doc/posix-functions/fscanf.texi index 7898463268..de35d8d1d8 100644 --- a/doc/posix-functions/fscanf.texi +++ b/doc/posix-functions/fscanf.texi @@ -6,11 +6,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/fun LSB specification:@* @url{https://refspecs.linuxbase.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/baselib-fscanf.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/fwrite.texi b/doc/posix-functions/fwrite.texi index 8aa86b3a3a..5cd99e5940 100644 --- a/doc/posix-functions/fwrite.texi +++ b/doc/posix-functions/fwrite.texi @@ -4,12 +4,12 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwrite.html} -Gnulib module: stdio, nonblocking, sigpipe -@mindex stdio +Gnulib module: stdio-h, nonblocking, sigpipe +@mindex stdio-h @mindex nonblocking @mindex sigpipe -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -18,7 +18,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/getc.texi b/doc/posix-functions/getc.texi index 3ae40fed52..8b6cc112dc 100644 --- a/doc/posix-functions/getc.texi +++ b/doc/posix-functions/getc.texi @@ -4,11 +4,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/getc.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/getchar.texi b/doc/posix-functions/getchar.texi index 8c8f661350..4bc3c3068f 100644 --- a/doc/posix-functions/getchar.texi +++ b/doc/posix-functions/getchar.texi @@ -4,11 +4,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/getchar.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/printf.texi b/doc/posix-functions/printf.texi index 2f7a961580..aba01687b8 100644 --- a/doc/posix-functions/printf.texi +++ b/doc/posix-functions/printf.texi @@ -4,10 +4,10 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/printf.html} -Gnulib module: printf-posix or printf-gnu or stdio, nonblocking, sigpipe +Gnulib module: printf-posix or printf-gnu or stdio-h, nonblocking, sigpipe @mindex printf-posix @mindex printf-gnu -@mindex stdio +@mindex stdio-h @mindex nonblocking @mindex sigpipe @@ -104,7 +104,7 @@ glibc when used with @code{_FORTIFY_SOURCE >= 2} (set by default on Ubuntu), macOS 14, OpenBSD, MSVC 14, Android. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{printf-posix} or @code{printf-gnu}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{printf-posix} or @code{printf-gnu}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -113,7 +113,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{printf-posix} or @code{printf-gnu}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{printf-posix} or @code{printf-gnu}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/putc.texi b/doc/posix-functions/putc.texi index 5c3c567de9..aec5b7e7d8 100644 --- a/doc/posix-functions/putc.texi +++ b/doc/posix-functions/putc.texi @@ -4,12 +4,12 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/putc.html} -Gnulib module: stdio, nonblocking, sigpipe -@mindex stdio +Gnulib module: stdio-h, nonblocking, sigpipe +@mindex stdio-h @mindex nonblocking @mindex sigpipe -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -18,7 +18,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/putchar.texi b/doc/posix-functions/putchar.texi index b2947985e9..1305145534 100644 --- a/doc/posix-functions/putchar.texi +++ b/doc/posix-functions/putchar.texi @@ -4,12 +4,12 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/putchar.html} -Gnulib module: stdio, nonblocking, sigpipe -@mindex stdio +Gnulib module: stdio-h, nonblocking, sigpipe +@mindex stdio-h @mindex nonblocking @mindex sigpipe -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -18,7 +18,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/puts.texi b/doc/posix-functions/puts.texi index 1c492e8d2b..91e316f40c 100644 --- a/doc/posix-functions/puts.texi +++ b/doc/posix-functions/puts.texi @@ -4,12 +4,12 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/puts.html} -Gnulib module: stdio, nonblocking, sigpipe -@mindex stdio +Gnulib module: stdio-h, nonblocking, sigpipe +@mindex stdio-h @mindex nonblocking @mindex sigpipe -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -18,7 +18,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/read.texi b/doc/posix-functions/read.texi index 855f6ffd19..47ac707931 100644 --- a/doc/posix-functions/read.texi +++ b/doc/posix-functions/read.texi @@ -4,9 +4,9 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/read.html} -Gnulib module: read, stdio, nonblocking +Gnulib module: read, stdio-h, nonblocking @mindex read -@mindex stdio +@mindex stdio-h @mindex nonblocking Portability problems fixed by Gnulib module @code{read}: @@ -20,7 +20,7 @@ This function crashes when invoked with invalid arguments on some platforms: MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/scanf.texi b/doc/posix-functions/scanf.texi index acdcb89dd0..ded9a5422c 100644 --- a/doc/posix-functions/scanf.texi +++ b/doc/posix-functions/scanf.texi @@ -6,11 +6,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/fun LSB specification:@* @url{https://refspecs.linuxbase.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/baselib-scanf.html} -Gnulib module: stdio, nonblocking -@mindex stdio +Gnulib module: stdio-h, nonblocking +@mindex stdio-h @mindex nonblocking -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When reading from a non-blocking pipe whose buffer is empty, this function diff --git a/doc/posix-functions/vfprintf.texi b/doc/posix-functions/vfprintf.texi index 042c8958d3..ffebd0983d 100644 --- a/doc/posix-functions/vfprintf.texi +++ b/doc/posix-functions/vfprintf.texi @@ -4,10 +4,10 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html} -Gnulib module: vfprintf-posix or vfprintf-gnu or stdio, nonblocking, sigpipe +Gnulib module: vfprintf-posix or vfprintf-gnu or stdio-h, nonblocking, sigpipe @mindex vfprintf-posix @mindex vfprintf-gnu -@mindex stdio +@mindex stdio-h @mindex nonblocking @mindex sigpipe @@ -104,7 +104,7 @@ glibc when used with @code{_FORTIFY_SOURCE >= 2} (set by default on Ubuntu), macOS 14, OpenBSD, MSVC 14, Android. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{vfprintf-posix} or @code{vfprintf-gnu}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{vfprintf-posix} or @code{vfprintf-gnu}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -113,7 +113,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{vfprintf-posix} or @code{vfprintf-gnu}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{vfprintf-posix} or @code{vfprintf-gnu}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/vprintf.texi b/doc/posix-functions/vprintf.texi index 6534e2e23e..85bdf6977d 100644 --- a/doc/posix-functions/vprintf.texi +++ b/doc/posix-functions/vprintf.texi @@ -4,10 +4,10 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/vprintf.html} -Gnulib module: vprintf-posix or vprintf-gnu or stdio, nonblocking, sigpipe +Gnulib module: vprintf-posix or vprintf-gnu or stdio-h, nonblocking, sigpipe @mindex vprintf-posix @mindex vprintf-gnu -@mindex stdio +@mindex stdio-h @mindex nonblocking @mindex sigpipe @@ -104,7 +104,7 @@ glibc when used with @code{_FORTIFY_SOURCE >= 2} (set by default on Ubuntu), macOS 14, OpenBSD, MSVC 14, Android. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{vprintf-posix} or @code{vprintf-gnu}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{vprintf-posix} or @code{vprintf-gnu}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -113,7 +113,7 @@ platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{vprintf-posix} or @code{vprintf-gnu}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h} or @code{vprintf-posix} or @code{vprintf-gnu}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/doc/posix-functions/write.texi b/doc/posix-functions/write.texi index a3735af34b..a5e869ac1c 100644 --- a/doc/posix-functions/write.texi +++ b/doc/posix-functions/write.texi @@ -20,7 +20,7 @@ This function crashes when invoked with invalid arguments on some platforms: MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -35,7 +35,7 @@ write into the pipe buffer, on some platforms: mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio-h}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails with error diff --git a/doc/posix-headers/stdio.texi b/doc/posix-headers/stdio.texi index 9e7611b055..4b6f4295fc 100644 --- a/doc/posix-headers/stdio.texi +++ b/doc/posix-headers/stdio.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdio.h.html} -Gnulib module: stdio -@mindex stdio +Gnulib module: stdio-h +@mindex stdio-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/argp b/modules/argp index 9259934283..a4b0183a87 100644 --- a/modules/argp +++ b/modules/argp @@ -33,7 +33,7 @@ extensions vsnprintf sleep stdbool-h -stdio +stdio-h strerror memchr memmove diff --git a/modules/c-snprintf b/modules/c-snprintf index d3fe2fa03d..e0eb9d2078 100644 --- a/modules/c-snprintf +++ b/modules/c-snprintf @@ -7,7 +7,7 @@ lib/c-snprintf.c Depends-on: stdint-h -stdio +stdio-h c-vsnzprintf configure.ac: diff --git a/modules/c-snzprintf b/modules/c-snzprintf index 69bedfdb5d..f50db7fe0f 100644 --- a/modules/c-snzprintf +++ b/modules/c-snzprintf @@ -8,7 +8,7 @@ lib/c-snzprintf.c Depends-on: stdint-h -stdio +stdio-h c-vasnprintf configure.ac: diff --git a/modules/c-vasnprintf b/modules/c-vasnprintf index 245769ca57..eebaf3aed8 100644 --- a/modules/c-vasnprintf +++ b/modules/c-vasnprintf @@ -25,7 +25,7 @@ assert-h attribute limits-h stdint-h -stdio +stdio-h mixin/printf-posix free-posix nocrash diff --git a/modules/c-vasprintf b/modules/c-vasprintf index e362520781..852af1d7b4 100644 --- a/modules/c-vasprintf +++ b/modules/c-vasprintf @@ -8,7 +8,7 @@ lib/c-vasprintf.c Depends-on: stdint-h -stdio +stdio-h c-vasnprintf configure.ac: diff --git a/modules/c-vaszprintf b/modules/c-vaszprintf index c5b77a54ee..43fa9e40c9 100644 --- a/modules/c-vaszprintf +++ b/modules/c-vaszprintf @@ -8,7 +8,7 @@ lib/c-vaszprintf.c Depends-on: stdint-h -stdio +stdio-h c-vasnprintf configure.ac: diff --git a/modules/c-vsnprintf b/modules/c-vsnprintf index 8e5a9131a3..e4a0875d78 100644 --- a/modules/c-vsnprintf +++ b/modules/c-vsnprintf @@ -8,7 +8,7 @@ lib/c-vsnprintf.c Depends-on: stdint-h -stdio +stdio-h c-vsnzprintf configure.ac: diff --git a/modules/c-vsnzprintf b/modules/c-vsnzprintf index e2e7e0a261..5782a4e43b 100644 --- a/modules/c-vsnzprintf +++ b/modules/c-vsnzprintf @@ -8,7 +8,7 @@ lib/c-vsnzprintf.c Depends-on: stdint-h -stdio +stdio-h c-vasnprintf configure.ac: diff --git a/modules/c-xvasprintf b/modules/c-xvasprintf index a46e418544..981e339bb1 100644 --- a/modules/c-xvasprintf +++ b/modules/c-xvasprintf @@ -9,7 +9,7 @@ m4/strerrorname_np.m4 Depends-on: extensions -stdio +stdio-h c-vaszprintf xalloc-die diff --git a/modules/dfa b/modules/dfa index 2fb58c3b97..874235ea7c 100644 --- a/modules/dfa +++ b/modules/dfa @@ -28,7 +28,7 @@ regex stdbool-h stddef-h stdint-h -stdio +stdio-h stdlib string uchar diff --git a/modules/dfa-tests b/modules/dfa-tests index d27113168a..8d60a57503 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -6,7 +6,7 @@ tests/test-dfa-invalid-merge.sh Depends-on: binary-io -stdio +stdio-h stdlib string unistd diff --git a/modules/dprintf b/modules/dprintf index fb1cb408a0..0c60a94e7f 100644 --- a/modules/dprintf +++ b/modules/dprintf @@ -6,7 +6,7 @@ lib/dprintf.c m4/dprintf.m4 Depends-on: -stdio +stdio-h vdzprintf [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1] intprops [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1] errno-h [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1] diff --git a/modules/dzprintf b/modules/dzprintf index d1908574f3..862915078e 100644 --- a/modules/dzprintf +++ b/modules/dzprintf @@ -6,7 +6,7 @@ Files: lib/dzprintf.c Depends-on: -stdio +stdio-h vasnprintf intprops free-posix diff --git a/modules/error b/modules/error index 86ff700483..e3b8a65449 100644 --- a/modules/error +++ b/modules/error @@ -8,7 +8,7 @@ m4/error.m4 Depends-on: error-h stddef-h -stdio +stdio-h getprogname [test $COMPILE_ERROR_C = 1] gettext-h [test $COMPILE_ERROR_C = 1] gnulib-i18n [test $COMPILE_ERROR_C = 1] diff --git a/modules/fclose b/modules/fclose index 0ef34bdfd9..6de425d896 100644 --- a/modules/fclose +++ b/modules/fclose @@ -6,7 +6,7 @@ lib/fclose.c m4/fclose.m4 Depends-on: -stdio +stdio-h close [test $REPLACE_FCLOSE = 1] fflush [test $REPLACE_FCLOSE = 1] freading [test $REPLACE_FCLOSE = 1] diff --git a/modules/fdopen b/modules/fdopen index c3af75a013..ad5898a25e 100644 --- a/modules/fdopen +++ b/modules/fdopen @@ -6,7 +6,7 @@ lib/fdopen.c m4/fdopen.m4 Depends-on: -stdio +stdio-h msvc-inval [test $REPLACE_FDOPEN = 1] configure.ac: diff --git a/modules/fflush b/modules/fflush index c12ab70138..0f76f0d669 100644 --- a/modules/fflush +++ b/modules/fflush @@ -7,7 +7,7 @@ lib/stdio-impl.h m4/fflush.m4 Depends-on: -stdio +stdio-h fpurge [test $REPLACE_FFLUSH = 1] ftello [test $REPLACE_FFLUSH = 1] freading [test $REPLACE_FFLUSH = 1] diff --git a/modules/fopen b/modules/fopen index d5bdef5733..6bfb4c08c5 100644 --- a/modules/fopen +++ b/modules/fopen @@ -8,7 +8,7 @@ m4/fclose.m4 m4/fflush.m4 Depends-on: -stdio +stdio-h largefile fcntl-h [test $REPLACE_FOPEN = 1] stdbool-h [test $REPLACE_FOPEN = 1] diff --git a/modules/fprintf-posix b/modules/fprintf-posix index ce34fcbb72..703ce7519a 100644 --- a/modules/fprintf-posix +++ b/modules/fprintf-posix @@ -14,7 +14,7 @@ m4/printf.m4 m4/math_h.m4 Depends-on: -stdio +stdio-h nocrash printf-safe errno-h diff --git a/modules/fprintftime b/modules/fprintftime index 12c289794e..2ebd38377f 100644 --- a/modules/fprintftime +++ b/modules/fprintftime @@ -7,7 +7,7 @@ lib/fprintftime.c lib/strftime.c Depends-on: -stdio +stdio-h nstrftime time_rz diff --git a/modules/fpurge b/modules/fpurge index 4834e41916..c2abb16a73 100644 --- a/modules/fpurge +++ b/modules/fpurge @@ -7,7 +7,7 @@ lib/stdio-impl.h m4/fpurge.m4 Depends-on: -stdio +stdio-h configure.ac: gl_FUNC_FPURGE diff --git a/modules/freopen b/modules/freopen index c7bcdc04e6..6bf857bb9c 100644 --- a/modules/freopen +++ b/modules/freopen @@ -8,7 +8,7 @@ m4/freopen.m4 Depends-on: fcntl-h [test $REPLACE_FREOPEN = 1] open [test $REPLACE_FREOPEN = 1] -stdio +stdio-h largefile configure.ac: diff --git a/modules/fseek b/modules/fseek index 64b9a9a56b..8b2af1645d 100644 --- a/modules/fseek +++ b/modules/fseek @@ -6,7 +6,7 @@ lib/fseek.c m4/fseek.m4 Depends-on: -stdio +stdio-h fseeko [test $REPLACE_FSEEK = 1] configure.ac: diff --git a/modules/fseeko b/modules/fseeko index d47763f24e..58f50d6abe 100644 --- a/modules/fseeko +++ b/modules/fseeko @@ -10,7 +10,7 @@ Depends-on: extensions largefile lseek -stdio +stdio-h sys_types # Just to guarantee consistency between fseek() and fseeko(). fseek diff --git a/modules/ftell b/modules/ftell index cfd1ad1596..32ab47e13b 100644 --- a/modules/ftell +++ b/modules/ftell @@ -6,7 +6,7 @@ lib/ftell.c m4/ftell.m4 Depends-on: -stdio +stdio-h errno-h ftello [test $REPLACE_FTELL = 1] diff --git a/modules/ftello b/modules/ftello index f85c4e8b1d..24f765d9a2 100644 --- a/modules/ftello +++ b/modules/ftello @@ -9,7 +9,7 @@ m4/ftello.m4 m4/ungetc.m4 Depends-on: -stdio +stdio-h extensions largefile sys_types diff --git a/modules/fzprintf b/modules/fzprintf index a6e2f2d065..41b13f9930 100644 --- a/modules/fzprintf +++ b/modules/fzprintf @@ -6,7 +6,7 @@ Files: lib/fzprintf.c Depends-on: -stdio +stdio-h vasnprintf intprops free-posix diff --git a/modules/getdelim b/modules/getdelim index d773c2d94b..4d61074c2b 100644 --- a/modules/getdelim +++ b/modules/getdelim @@ -6,7 +6,7 @@ lib/getdelim.c m4/getdelim.m4 Depends-on: -stdio +stdio-h extensions limits-h [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1] stdint-h [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1] diff --git a/modules/getline b/modules/getline index cde088e62e..0bcc23a479 100644 --- a/modules/getline +++ b/modules/getline @@ -6,7 +6,7 @@ lib/getline.c m4/getline.m4 Depends-on: -stdio +stdio-h extensions getdelim [test $REPLACE_GETLINE = 1] diff --git a/modules/ignore-value-tests b/modules/ignore-value-tests index 855d771936..e9a7c610e3 100644 --- a/modules/ignore-value-tests +++ b/modules/ignore-value-tests @@ -3,7 +3,7 @@ tests/test-ignore-value.c Depends-on: attribute -stdio +stdio-h configure.ac: diff --git a/modules/libtextstyle-optional b/modules/libtextstyle-optional index a1b6c72185..8f757224be 100644 --- a/modules/libtextstyle-optional +++ b/modules/libtextstyle-optional @@ -9,7 +9,7 @@ Depends-on: gen-header libtextstyle stdbool-h -stdio +stdio-h unistd fsync vasprintf-posix diff --git a/modules/nonblocking b/modules/nonblocking index 4e5c78d247..933c6f4a7e 100644 --- a/modules/nonblocking +++ b/modules/nonblocking @@ -14,7 +14,7 @@ fcntl-h ioctl msvc-nothrow stdbool-h -stdio +stdio-h sys_socket unistd diff --git a/modules/obstack-printf b/modules/obstack-printf index 324dde6889..9802bf8bf3 100644 --- a/modules/obstack-printf +++ b/modules/obstack-printf @@ -7,7 +7,7 @@ lib/obstack_printf.c Depends-on: obstack -stdio +stdio-h vasnprintf extensions diff --git a/modules/obstack-printf-posix b/modules/obstack-printf-posix index 12b44997a3..39402c2a8c 100644 --- a/modules/obstack-printf-posix +++ b/modules/obstack-printf-posix @@ -16,7 +16,7 @@ lib/obstack_printf.c Depends-on: obstack -stdio +stdio-h vasnprintf-posix extensions diff --git a/modules/obstack-zprintf b/modules/obstack-zprintf index d78196f4d5..18ec3a17ed 100644 --- a/modules/obstack-zprintf +++ b/modules/obstack-zprintf @@ -7,7 +7,7 @@ lib/obstack_printf.c Depends-on: obstack -stdio +stdio-h vasnprintf configure.ac: diff --git a/modules/pclose b/modules/pclose index e5ec82f767..ff9099ab42 100644 --- a/modules/pclose +++ b/modules/pclose @@ -6,7 +6,7 @@ lib/pclose.c m4/pclose.m4 Depends-on: -stdio +stdio-h configure.ac: gl_FUNC_PCLOSE diff --git a/modules/perror b/modules/perror index 4fca4318a5..c67c317c05 100644 --- a/modules/perror +++ b/modules/perror @@ -6,7 +6,7 @@ lib/perror.c m4/perror.m4 Depends-on: -stdio +stdio-h errno-h [test $REPLACE_PERROR = 1] strerror-override [test $REPLACE_PERROR = 1] strerror_r-posix [test $REPLACE_PERROR = 1] diff --git a/modules/popen b/modules/popen index 6dbb4f3ed6..494081105e 100644 --- a/modules/popen +++ b/modules/popen @@ -6,7 +6,7 @@ lib/popen.c m4/popen.m4 Depends-on: -stdio +stdio-h open [test $HAVE_POPEN = 0 || test $REPLACE_POPEN = 1] configure.ac: diff --git a/modules/posixcheck b/modules/posixcheck index 48791e5679..1c8565bf84 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -28,7 +28,7 @@ sched-h search-h signal-h spawn-h -stdio +stdio-h stdlib string strings diff --git a/modules/printf-posix b/modules/printf-posix index 8ad5c75810..40cd6fd6ee 100644 --- a/modules/printf-posix +++ b/modules/printf-posix @@ -14,7 +14,7 @@ m4/printf.m4 m4/asm-underscore.m4 Depends-on: -stdio +stdio-h printf-safe vfprintf-posix [test $REPLACE_PRINTF = 1] diff --git a/modules/remove b/modules/remove index 7961af8b04..cfbdeb24bd 100644 --- a/modules/remove +++ b/modules/remove @@ -6,7 +6,7 @@ lib/remove.c m4/remove.m4 Depends-on: -stdio +stdio-h rmdir [test $REPLACE_REMOVE = 1] unlink [test $REPLACE_REMOVE = 1] diff --git a/modules/rename b/modules/rename index 44b14179ef..f9fef59c55 100644 --- a/modules/rename +++ b/modules/rename @@ -6,7 +6,7 @@ lib/rename.c m4/rename.m4 Depends-on: -stdio +stdio-h canonicalize-lgpl [test $REPLACE_RENAME = 1] chdir [test $REPLACE_RENAME = 1] dirname-lgpl [test $REPLACE_RENAME = 1] diff --git a/modules/renameatu b/modules/renameatu index 0568a3fefe..49c2bd9882 100644 --- a/modules/renameatu +++ b/modules/renameatu @@ -8,7 +8,7 @@ lib/renameatu.h m4/renameat.m4 Depends-on: -stdio +stdio-h extensions fcntl-h filenamecat-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] diff --git a/modules/sigpipe b/modules/sigpipe index 2cb22d5c58..2e67f07218 100644 --- a/modules/sigpipe +++ b/modules/sigpipe @@ -16,7 +16,7 @@ msvc-nothrow raise signal-h sigprocmask -stdio +stdio-h unistd configure.ac: diff --git a/modules/snprintf b/modules/snprintf index 72c36bc72c..3925439950 100644 --- a/modules/snprintf +++ b/modules/snprintf @@ -7,7 +7,7 @@ m4/snprintf.m4 m4/printf.m4 Depends-on: -stdio +stdio-h errno-h [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1] stdint-h [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1] vsnzprintf [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1] diff --git a/modules/snzprintf b/modules/snzprintf index 51fb6b4bae..d2ad26f5c2 100644 --- a/modules/snzprintf +++ b/modules/snzprintf @@ -6,7 +6,7 @@ Files: lib/snzprintf.c Depends-on: -stdio +stdio-h vasnprintf errno-h stdint-h diff --git a/modules/sprintf-posix b/modules/sprintf-posix index e6d1b58e17..032722c849 100644 --- a/modules/sprintf-posix +++ b/modules/sprintf-posix @@ -14,7 +14,7 @@ m4/printf.m4 m4/math_h.m4 Depends-on: -stdio +stdio-h nocrash printf-safe multiarch diff --git a/modules/stdio b/modules/stdio index dfae001260..979aa09d56 100644 --- a/modules/stdio +++ b/modules/stdio @@ -1,215 +1,20 @@ Description: A GNU-like . +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'stdio-h' instead. + Files: -lib/stdio.in.h -lib/stdio-read.c -lib/stdio-write.c -m4/stdio_h.m4 -m4/musl.m4 Depends-on: -extensions -gen-header -include_next -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use -ssize_t -stddef-h -sys_types - -configure.ac-early: -gl_STDIO_H_EARLY +stdio-h configure.ac: -gl_STDIO_H -gl_STDIO_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P -gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1]) -gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1]) - -dnl No need to create extra modules for these functions. Everyone who uses -dnl likely needs them. -gl_STDIO_MODULE_INDICATOR([fscanf]) -gl_MODULE_INDICATOR([fscanf]) -gl_STDIO_MODULE_INDICATOR([scanf]) -gl_MODULE_INDICATOR([scanf]) -gl_STDIO_MODULE_INDICATOR([fgetc]) -gl_STDIO_MODULE_INDICATOR([getc]) -gl_STDIO_MODULE_INDICATOR([getchar]) -gl_STDIO_MODULE_INDICATOR([fgets]) -gl_STDIO_MODULE_INDICATOR([fread]) - -dnl No need to create extra modules for these functions. Everyone who uses -dnl likely needs them. -gl_STDIO_MODULE_INDICATOR([fprintf]) -gl_STDIO_MODULE_INDICATOR([printf]) -gl_STDIO_MODULE_INDICATOR([vfprintf]) -gl_STDIO_MODULE_INDICATOR([vprintf]) -gl_STDIO_MODULE_INDICATOR([fputc]) -gl_STDIO_MODULE_INDICATOR([putc]) -gl_STDIO_MODULE_INDICATOR([putchar]) -gl_STDIO_MODULE_INDICATOR([fputs]) -gl_STDIO_MODULE_INDICATOR([puts]) -gl_STDIO_MODULE_INDICATOR([fwrite]) Makefile.am: -BUILT_SOURCES += stdio.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ - -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ - -e 's/@''GNULIB_DZPRINTF''@/$(GNULIB_DZPRINTF)/g' \ - -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ - -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ - -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ - -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ - -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ - -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ - -e 's/@''GNULIB_FOPEN_GNU''@/$(GNULIB_FOPEN_GNU)/g' \ - -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ - -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ - -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ - -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ - -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ - -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ - -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ - -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ - -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ - -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ - -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ - -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ - -e 's/@''GNULIB_FZPRINTF''@/$(GNULIB_FZPRINTF)/g' \ - -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ - -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ - -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ - -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_OBSTACK_ZPRINTF''@/$(GNULIB_OBSTACK_ZPRINTF)/g' \ - -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ - -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ - -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ - -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ - -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ - -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ - -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ - -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ - -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ - -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ - -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ - -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ - -e 's/@''GNULIB_SNZPRINTF''@/$(GNULIB_SNZPRINTF)/g' \ - -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_SZPRINTF''@/$(GNULIB_SZPRINTF)/g' \ - -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ - -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ - -e 's/@''GNULIB_VASZPRINTF''@/$(GNULIB_VASZPRINTF)/g' \ - -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ - -e 's/@''GNULIB_VDZPRINTF''@/$(GNULIB_VDZPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VFZPRINTF''@/$(GNULIB_VFZPRINTF)/g' \ - -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ - -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ - -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ - -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ - -e 's/@''GNULIB_VSNZPRINTF''@/$(GNULIB_VSNZPRINTF)/g' \ - -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' \ - -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ - -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ - -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ - < $(srcdir)/stdio.in.h > $@-t1 - $(AM_V_at)sed \ - -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ - -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ - -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ - -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ - -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ - -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ - -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \ - -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ - -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \ - -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ - -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ - -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ - -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ - -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ - -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ - -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ - -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ - -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ - -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ - < $@-t1 > $@-t2 - $(AM_V_at)sed \ - -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ - -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ - -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ - -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ - -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ - -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|$(REPLACE_FOPEN_FOR_FOPEN_GNU)|g' \ - -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ - -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ - -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ - -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ - -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ - -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ - -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ - -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ - -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ - -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ - -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ - -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ - -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ - -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ - -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ - -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ - -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ - -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ - -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ - -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ - -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ - -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ - -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ - -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ - -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ - -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ - -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ - -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $@-t2 > $@-t3 - $(AM_V_at)rm -f $@-t1 $@-t2 - $(AM_V_at)mv $@-t3 $@ -MOSTLYCLEANFILES += stdio.h stdio.h-t1 stdio.h-t2 stdio.h-t3 - -if GL_COND_OBJ_STDIO_READ -lib_SOURCES += stdio-read.c -endif -if GL_COND_OBJ_STDIO_WRITE -lib_SOURCES += stdio-write.c -endif Include: @@ -218,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/stdio-c++-tests b/modules/stdio-c++-tests deleted file mode 100644 index f13f22b8da..0000000000 --- a/modules/stdio-c++-tests +++ /dev/null @@ -1,20 +0,0 @@ -Files: -tests/test-stdio-c++.cc -tests/test-stdio-c++2.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-stdio-c++ -check_PROGRAMS += test-stdio-c++ -test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc -test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB) -endif diff --git a/modules/stdio-h b/modules/stdio-h new file mode 100644 index 0000000000..dfae001260 --- /dev/null +++ b/modules/stdio-h @@ -0,0 +1,221 @@ +Description: +A GNU-like . + +Files: +lib/stdio.in.h +lib/stdio-read.c +lib/stdio-write.c +m4/stdio_h.m4 +m4/musl.m4 + +Depends-on: +extensions +gen-header +include_next +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use +ssize_t +stddef-h +sys_types + +configure.ac-early: +gl_STDIO_H_EARLY + +configure.ac: +gl_STDIO_H +gl_STDIO_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P +gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1]) +gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1]) + +dnl No need to create extra modules for these functions. Everyone who uses +dnl likely needs them. +gl_STDIO_MODULE_INDICATOR([fscanf]) +gl_MODULE_INDICATOR([fscanf]) +gl_STDIO_MODULE_INDICATOR([scanf]) +gl_MODULE_INDICATOR([scanf]) +gl_STDIO_MODULE_INDICATOR([fgetc]) +gl_STDIO_MODULE_INDICATOR([getc]) +gl_STDIO_MODULE_INDICATOR([getchar]) +gl_STDIO_MODULE_INDICATOR([fgets]) +gl_STDIO_MODULE_INDICATOR([fread]) + +dnl No need to create extra modules for these functions. Everyone who uses +dnl likely needs them. +gl_STDIO_MODULE_INDICATOR([fprintf]) +gl_STDIO_MODULE_INDICATOR([printf]) +gl_STDIO_MODULE_INDICATOR([vfprintf]) +gl_STDIO_MODULE_INDICATOR([vprintf]) +gl_STDIO_MODULE_INDICATOR([fputc]) +gl_STDIO_MODULE_INDICATOR([putc]) +gl_STDIO_MODULE_INDICATOR([putchar]) +gl_STDIO_MODULE_INDICATOR([fputs]) +gl_STDIO_MODULE_INDICATOR([puts]) +gl_STDIO_MODULE_INDICATOR([fwrite]) + +Makefile.am: +BUILT_SOURCES += stdio.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ + -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ + -e 's/@''GNULIB_DZPRINTF''@/$(GNULIB_DZPRINTF)/g' \ + -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ + -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ + -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ + -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ + -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ + -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ + -e 's/@''GNULIB_FOPEN_GNU''@/$(GNULIB_FOPEN_GNU)/g' \ + -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ + -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ + -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ + -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ + -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ + -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ + -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ + -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ + -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ + -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ + -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ + -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ + -e 's/@''GNULIB_FZPRINTF''@/$(GNULIB_FZPRINTF)/g' \ + -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ + -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ + -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ + -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ + -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ + -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ + -e 's/@''GNULIB_OBSTACK_ZPRINTF''@/$(GNULIB_OBSTACK_ZPRINTF)/g' \ + -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ + -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ + -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ + -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ + -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ + -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ + -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ + -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ + -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ + -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ + -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ + -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ + -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ + -e 's/@''GNULIB_SNZPRINTF''@/$(GNULIB_SNZPRINTF)/g' \ + -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ + -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_SZPRINTF''@/$(GNULIB_SZPRINTF)/g' \ + -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ + -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ + -e 's/@''GNULIB_VASZPRINTF''@/$(GNULIB_VASZPRINTF)/g' \ + -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ + -e 's/@''GNULIB_VDZPRINTF''@/$(GNULIB_VDZPRINTF)/g' \ + -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ + -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_VFZPRINTF''@/$(GNULIB_VFZPRINTF)/g' \ + -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ + -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ + -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ + -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ + -e 's/@''GNULIB_VSNZPRINTF''@/$(GNULIB_VSNZPRINTF)/g' \ + -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' \ + -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ + -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ + -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ + < $(srcdir)/stdio.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ + -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ + -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ + -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ + -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ + -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \ + -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \ + -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ + -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ + -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ + -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ + -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ + -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ + -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ + -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ + -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ + -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ + -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ + -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ + -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ + -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ + -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|$(REPLACE_FOPEN_FOR_FOPEN_GNU)|g' \ + -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ + -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ + -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ + -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ + -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ + -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ + -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ + -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ + -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ + -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ + -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ + -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ + -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ + -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ + -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ + -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ + -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ + -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ + -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ + -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ + -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ + -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ + -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ + -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ + -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ + -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ + -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $@-t2 > $@-t3 + $(AM_V_at)rm -f $@-t1 $@-t2 + $(AM_V_at)mv $@-t3 $@ +MOSTLYCLEANFILES += stdio.h stdio.h-t1 stdio.h-t2 stdio.h-t3 + +if GL_COND_OBJ_STDIO_READ +lib_SOURCES += stdio-read.c +endif +if GL_COND_OBJ_STDIO_WRITE +lib_SOURCES += stdio-write.c +endif + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/stdio-h-c++-tests b/modules/stdio-h-c++-tests new file mode 100644 index 0000000000..47df024a40 --- /dev/null +++ b/modules/stdio-h-c++-tests @@ -0,0 +1,20 @@ +Files: +tests/test-stdio-h-c++.cc +tests/test-stdio-h-c++2.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-stdio-h-c++ +check_PROGRAMS += test-stdio-h-c++ +test_stdio_h_c___SOURCES = test-stdio-h-c++.cc test-stdio-h-c++2.cc +test_stdio_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB) +endif diff --git a/modules/stdio-tests b/modules/stdio-h-tests similarity index 67% rename from modules/stdio-tests rename to modules/stdio-h-tests index 0e6d85593f..33419f47b2 100644 --- a/modules/stdio-tests +++ b/modules/stdio-h-tests @@ -1,5 +1,5 @@ Files: -tests/test-stdio.c +tests/test-stdio-h.c tests/macros.h m4/exponentd.m4 @@ -7,7 +7,7 @@ Depends-on: assert-h signed-nan signed-snan -stdio-c++-tests +stdio-h-c++-tests fgetc-tests fputc-tests fread-tests @@ -17,5 +17,5 @@ configure.ac: gl_DOUBLE_EXPONENT_LOCATION Makefile.am: -TESTS += test-stdio -check_PROGRAMS += test-stdio +TESTS += test-stdio-h +check_PROGRAMS += test-stdio-h diff --git a/modules/szprintf b/modules/szprintf index a578fe7bc8..2b53c11ba2 100644 --- a/modules/szprintf +++ b/modules/szprintf @@ -6,7 +6,7 @@ Files: lib/szprintf.c Depends-on: -stdio +stdio-h vasnprintf errno-h stdint-h diff --git a/modules/tmpfile b/modules/tmpfile index 426d9fb6cc..aa4fc94ded 100644 --- a/modules/tmpfile +++ b/modules/tmpfile @@ -6,7 +6,7 @@ lib/tmpfile.c m4/tmpfile.m4 Depends-on: -stdio +stdio-h largefile pathmax [test $REPLACE_TMPFILE = 1] stdbool-h [test $REPLACE_TMPFILE = 1] diff --git a/modules/unicodeio b/modules/unicodeio index ccf1f5f88d..ada2e48b06 100644 --- a/modules/unicodeio +++ b/modules/unicodeio @@ -15,7 +15,7 @@ gettext-h gnulib-i18n localcharset error -stdio +stdio-h configure.ac: gl_UNICODEIO diff --git a/modules/vasnprintf b/modules/vasnprintf index 7062704afe..98ac72ada0 100644 --- a/modules/vasnprintf +++ b/modules/vasnprintf @@ -20,7 +20,7 @@ m4/math_h.m4 m4/exponentd.m4 Depends-on: -stdio +stdio-h alloca-opt attribute float-h diff --git a/modules/vasnwprintf b/modules/vasnwprintf index 73b9afc826..0bf89666c2 100644 --- a/modules/vasnwprintf +++ b/modules/vasnwprintf @@ -24,7 +24,7 @@ m4/exponentd.m4 m4/musl.m4 Depends-on: -stdio +stdio-h alloca-opt attribute float-h diff --git a/modules/vasprintf b/modules/vasprintf index 6c7f04f6ac..84b59107a8 100644 --- a/modules/vasprintf +++ b/modules/vasprintf @@ -7,7 +7,7 @@ lib/asprintf.c m4/vasprintf.m4 Depends-on: -stdio +stdio-h extensions vasnprintf [test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1] errno-h [test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1] diff --git a/modules/vaszprintf b/modules/vaszprintf index 2c172e039e..5b30daf5ee 100644 --- a/modules/vaszprintf +++ b/modules/vaszprintf @@ -6,7 +6,7 @@ lib/vaszprintf.c lib/aszprintf.c Depends-on: -stdio +stdio-h vasnprintf errno-h stdint-h diff --git a/modules/vdprintf b/modules/vdprintf index 51539cdbc1..b400d05482 100644 --- a/modules/vdprintf +++ b/modules/vdprintf @@ -6,7 +6,7 @@ lib/vdprintf.c m4/vdprintf.m4 Depends-on: -stdio +stdio-h vdzprintf [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1] intprops [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1] errno-h [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1] diff --git a/modules/vdzprintf b/modules/vdzprintf index 852c70b794..dd24cab2d4 100644 --- a/modules/vdzprintf +++ b/modules/vdzprintf @@ -6,7 +6,7 @@ Files: lib/vdzprintf.c Depends-on: -stdio +stdio-h vasnprintf intprops free-posix diff --git a/modules/vfprintf-posix b/modules/vfprintf-posix index d9283dee84..5e7fc66798 100644 --- a/modules/vfprintf-posix +++ b/modules/vfprintf-posix @@ -14,7 +14,7 @@ m4/printf.m4 m4/math_h.m4 Depends-on: -stdio +stdio-h nocrash printf-safe multiarch diff --git a/modules/vfscanf b/modules/vfscanf index 24ef6011c3..db60d75f72 100644 --- a/modules/vfscanf +++ b/modules/vfscanf @@ -4,7 +4,7 @@ vfscanf() function: parse formatted text from a stream Files: Depends-on: -stdio +stdio-h configure.ac: gl_STDIO_MODULE_INDICATOR([vfscanf]) diff --git a/modules/vfzprintf b/modules/vfzprintf index dac58b64ef..d432179f07 100644 --- a/modules/vfzprintf +++ b/modules/vfzprintf @@ -6,7 +6,7 @@ Files: lib/vfzprintf.c Depends-on: -stdio +stdio-h vasnprintf intprops free-posix diff --git a/modules/vprintf-posix b/modules/vprintf-posix index afa2de2355..08ba81881c 100644 --- a/modules/vprintf-posix +++ b/modules/vprintf-posix @@ -13,7 +13,7 @@ m4/vprintf-posix.m4 m4/printf.m4 Depends-on: -stdio +stdio-h printf-safe vfprintf-posix [test $REPLACE_VPRINTF = 1] diff --git a/modules/vscanf b/modules/vscanf index 37392fed2f..9a4daec12b 100644 --- a/modules/vscanf +++ b/modules/vscanf @@ -4,7 +4,7 @@ vscanf() function: parse formatted text from standard input Files: Depends-on: -stdio +stdio-h configure.ac: gl_STDIO_MODULE_INDICATOR([vscanf]) diff --git a/modules/vsnprintf b/modules/vsnprintf index b0d5a5954a..cd8fa7d3c3 100644 --- a/modules/vsnprintf +++ b/modules/vsnprintf @@ -8,7 +8,7 @@ m4/vsnprintf.m4 m4/printf.m4 Depends-on: -stdio +stdio-h errno-h [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1] stdint-h [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1] vsnzprintf [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1] diff --git a/modules/vsnzprintf b/modules/vsnzprintf index 15fcf4bcaa..63875da574 100644 --- a/modules/vsnzprintf +++ b/modules/vsnzprintf @@ -6,7 +6,7 @@ Files: lib/vsnzprintf.c Depends-on: -stdio +stdio-h vasnprintf errno-h stdint-h diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix index 06af25f5a2..1ba5fb6263 100644 --- a/modules/vsprintf-posix +++ b/modules/vsprintf-posix @@ -14,7 +14,7 @@ m4/printf.m4 m4/math_h.m4 Depends-on: -stdio +stdio-h nocrash printf-safe multiarch diff --git a/modules/vszprintf b/modules/vszprintf index b3064695b8..da433264e3 100644 --- a/modules/vszprintf +++ b/modules/vszprintf @@ -6,7 +6,7 @@ Files: lib/vszprintf.c Depends-on: -stdio +stdio-h vasnprintf errno-h stdint-h diff --git a/modules/vzprintf b/modules/vzprintf index be88f208c2..369bd2ee66 100644 --- a/modules/vzprintf +++ b/modules/vzprintf @@ -6,7 +6,7 @@ Files: lib/vzprintf.c Depends-on: -stdio +stdio-h vfzprintf configure.ac: diff --git a/modules/xprintf b/modules/xprintf index e92080a170..323f83883a 100644 --- a/modules/xprintf +++ b/modules/xprintf @@ -7,7 +7,7 @@ lib/xprintf.h lib/xprintf.c Depends-on: -stdio +stdio-h error exitfail gettext-h diff --git a/modules/xvasprintf b/modules/xvasprintf index 4f4acaf297..fbee31d1e5 100644 --- a/modules/xvasprintf +++ b/modules/xvasprintf @@ -11,7 +11,7 @@ m4/strerrorname_np.m4 Depends-on: extensions -stdio +stdio-h vaszprintf xalloc xalloc-die diff --git a/modules/zprintf b/modules/zprintf index d4acca6355..5df7fb7c51 100644 --- a/modules/zprintf +++ b/modules/zprintf @@ -6,7 +6,7 @@ Files: lib/zprintf.c Depends-on: -stdio +stdio-h vfzprintf configure.ac: diff --git a/tests/test-stdio-c++.cc b/tests/test-stdio-h-c++.cc similarity index 100% rename from tests/test-stdio-c++.cc rename to tests/test-stdio-h-c++.cc diff --git a/tests/test-stdio-c++2.cc b/tests/test-stdio-h-c++2.cc similarity index 100% rename from tests/test-stdio-c++2.cc rename to tests/test-stdio-h-c++2.cc diff --git a/tests/test-stdio.c b/tests/test-stdio-h.c similarity index 100% rename from tests/test-stdio.c rename to tests/test-stdio-h.c