mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-11 12:50:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
acf0cb6f24
glibc/libio
History
Joseph Myers acf0cb6f24 Don't include <bits/stdio-lock.h> from installed <libio.h>. 
Every so often someone gets confused by the fact that the installed
<bits/stdio-lock.h> header includes the non-installed <lowlevellock.h>
header.

This inclusion is not in fact a bug, because <bits/stdio-lock.h> only
gets included by any header that users should include directly if
_IO_MTSAFE_IO is defined, and that's an internal define used when
building libio, not a feature test macro it's valid for users to
define.  However, on general principles it's best to have as little as
possible in the installed headers that is inapplicable for valid uses
of the installed glibc.

This patch moves the include of <bits/stdio-lock.h> to the internal
header include/libio.h, so that even if someone defines _IO_MTSAFE_IO
it won't get included.  This is intended as preparation for stopping
<bits/stdio-lock.h> and <bits/libc-lock.h> from being installed at all
(after this patch they aren't used in any installed header; formally
of course they don't need to be installed even before this patch, but
stopping them being installed before removing the #include would just
exacerbate the confusion described above), and then moving those out
of the bits/ namespace in accordance with the principle that that
namespace is only for installed headers.

The tests scanf15.c and scanf17.c avoid the internal headers; after
this patch that means they need to undefine _IO_MTSAFE_IO as well as
_LIBC so as to get a working _IO_lock_t definition for libio.h.  This
brings them closer to using the headers as an installed program would,
which clearly accords with the intent of those tests.

Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch).

	* libio/libio.h [_IO_MTSAFE_IO]: Remove include of
	<bits/stdio-lock.h> and commented-out include of <comthread.h>.
	* include/libio.h [!_ISOMAC && _IO_MTSAFE_IO]: Include
	<bits/stdio-lock.h>.
	* stdio-common/scanf15.c (_IO_MTSAFE_IO): Undefine.
	* stdio-common/scanf17.c (_IO_MTSAFE_IO): Likewise.
2015-09-03 20:24:54 +00:00
..
bits Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__fbufsize.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__flbf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__fpending.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__fpurge.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__freadable.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__freading.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__fsetlocking.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__fwritable.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
__fwriting.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
bug-fopena+.c
bug-fseek.c
bug-ftell.c
bug-memstream1.c
bug-mmap-fflush.c
bug-rewind2.c
bug-rewind.c
bug-ungetc2.c
bug-ungetc3.c
bug-ungetc4.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
bug-ungetc.c
bug-ungetwc1.c
bug-ungetwc2.c
bug-wfflush.c
bug-wmemstream1.c
bug-wsetpos.c
clearerr_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
clearerr.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
Depend
fcloseall.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
feof_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
feof.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ferror_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ferror.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
filedoalloc.c Fix BZ #16734 -- fopen calls mmap to allocate its buffer 2015-08-12 18:56:08 -07:00
fileno.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fileops.c Use "|" instead of "+" when combine the _IO_LINE_BUF and _IO_UNBUFFERED flags 2015-07-08 13:53:11 +05:30
fmemopen.c Fix BZ #18820 -- fmemopen may leak memory on failure. 2015-08-12 23:51:04 -07:00
fputc_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fputc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fputwc_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fputwc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
freopen64.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
freopen.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
fseek.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fseeko64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fseeko.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ftello64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ftello.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fwide.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fwprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
fwscanf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
genops.c Fix BZ #16734 -- fopen calls mmap to allocate its buffer 2015-08-12 18:56:08 -07:00
getc_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getchar_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getchar.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getwc_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getwc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getwchar_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
getwchar.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofclose.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofdopen.c Minor cleanups in libio/iofdopen.c 2015-03-23 13:46:36 -07:00
iofflush_u.c Fix getpass fflush_unlocked namespace (bug 18540). 2015-06-17 20:14:18 +00:00
iofflush.c Fix getpass fflush_unlocked namespace (bug 18540). 2015-06-17 20:14:18 +00:00
iofgetpos64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofgetpos.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofgets_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofgets.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofgetws_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofgetws.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofopen64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofopen.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
iofopncook.c Fix BZ #18757. 2015-09-01 08:48:15 -07:00
iofputs_u.c Fix syslog fputs_unlocked namespace (bug 18530). 2015-06-12 22:36:38 +00:00
iofputs.c Fix syslog fputs_unlocked namespace (bug 18530). 2015-06-12 22:36:38 +00:00
iofputws_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofputws.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofread_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofread.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofsetpos64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofsetpos.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ioftell.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofwide.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
iofwrite_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iofwrite.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iogetdelim.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iogetline.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iogets.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iogetwline.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iolibio.h
iopadn.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iopopen.c Cleanup: add missing #include's 2015-02-17 16:03:41 -08:00
ioputs.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ioseekoff.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ioseekpos.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iosetbuffer.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iosetvbuf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ioungetc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
ioungetwc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iovdprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iovsprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iovsscanf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
iovswscanf.c Fix swscanf vswscanf namespace (bug 18542). 2015-06-17 20:15:22 +00:00
iowpadn.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
libc_fatal.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
libio.h Don't include <bits/stdio-lock.h> from installed <libio.h>. 2015-09-03 20:24:54 +00:00
libioP.h Fix BZ #16734 -- fopen calls mmap to allocate its buffer 2015-08-12 18:56:08 -07:00
Makefile Fix BZ #18820 -- fmemopen may leak memory on failure. 2015-08-12 23:51:04 -07:00
memstream.c Fix open_memstream namespace (bug 18498). 2015-06-05 23:32:46 +00:00
obprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldfileops.c Add #include <unistd.h> to libio/oldfileops.c for write. 2015-08-06 08:51:31 -07:00
oldfmemopen.c Fix BZ #18820 -- fmemopen may leak memory on failure. 2015-08-12 23:51:04 -07:00
oldiofclose.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldiofdopen.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
oldiofgetpos64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldiofgetpos.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldiofopen.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
oldiofsetpos64.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldiofsetpos.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldiopopen.c Avoid some aliasing violations in libio 2015-05-22 11:40:04 +02:00
oldpclose.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldstdfiles.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
oldtmpfile.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
pclose.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
peekc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putc_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putchar_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putchar.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putwc_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putwc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putwchar_u.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
putwchar.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
rewind.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
setbuf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
setlinebuf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
stdfiles.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
stdio.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
stdio.h Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
strfile.h Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
strops.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
swprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
swscanf.c Fix swscanf vswscanf namespace (bug 18542). 2015-06-17 20:15:22 +00:00
test-fmemopen.c Fix BZ #18757. 2015-09-01 08:48:15 -07:00
test-freopen.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
test-freopen.sh Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst_getwc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst_getwc.input
tst_putwc.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst_swprintf.c
tst_swscanf.c
tst_wprintf2.c
tst_wprintf.c
tst_wscanf.c
tst_wscanf.input
tst-atime.c Fix libio/tst-atime not to presume ST_NOATIME exists. 2015-02-06 12:24:16 -08:00
tst-eof.c
tst-ext2.c
tst-ext.c
tst-fgetwc.c
tst-fgetwc.input
tst-fgetws.c
tst-fopenloc2.c
tst-fopenloc.c Fix minor formatting violation. 2015-02-25 13:11:26 -08:00
tst-fputws.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-freopen.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-fseek.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-ftell-active-handler.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-ftell-append.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-ftell-partial-wide.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-fwrite-error.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-memstream1.c
tst-memstream2.c Adjust timeouts for some tests, to accommodate slow processors, 2015-02-22 01:05:02 -08:00
tst-mmap2-eofsync.c
tst-mmap-eofsync.c
tst-mmap-fflushsync.c
tst-mmap-offend.c
tst-mmap-setvbuf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-popen1.c
tst-setvbuf1.c
tst-sscanf.c
tst-swscanf.c
tst-ungetwc1.c
tst-ungetwc2.c
tst-widetext.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
tst-widetext.input
tst-wmemstream1.c
tst-wmemstream2.c
vasprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
Versions libio: fmemopen rewrite to POSIX compliance 2015-07-08 12:07:21 -03:00
vscanf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
vsnprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
vswprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
vwprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
vwscanf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
wfiledoalloc.c Fix BZ #16734 -- fopen calls mmap to allocate its buffer 2015-08-12 18:56:08 -07:00
wfileops.c Use "|" instead of "+" when combine the _IO_LINE_BUF and _IO_UNBUFFERED flags 2015-07-08 13:53:11 +05:30
wgenops.c Fix BZ #16734 -- fopen calls mmap to allocate its buffer 2015-08-12 18:56:08 -07:00
wmemstream.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
wprintf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
wscanf.c Update copyright dates with scripts/update-copyrights. 2015-01-02 16:29:47 +00:00
wstrops.c Fix BZ #17269 -- _IO_wstr_overflow integer overflow 2015-02-22 12:01:47 -08:00