mirror of
git://sourceware.org/git/glibc.git
synced 2025-02-23 13:09:58 +08:00
874aa52349
__isoc99_sscanf, __isoc99_vscanf): New prototypes.
(__isoc99_vsscanf, __isoc99_vfscanf): New prototypes, add
libc_hidden_proto.
* include/wchar.h (__isoc99_fwscanf, __isoc99_wscanf,
__isoc99_swscanf, __isoc99_vwscanf): New prototypes.
(__isoc99_vswscanf, __isoc99_vfwscanf): New prototypes,
add libc_hidden_proto.
* libio/stdio.h (fscanf, scanf, sscanf, vfscanf, vscanf,
vsscanf): Redirect to __isoc99_* if strict ISO C99 or POSIX
conformance requested.
* wcsmbs/wchar.h (fwscanf, wscanf, swscanf, vfwscanf, vwscanf,
vswscanf): Redirect to __isoc99_* if strict ISO C99 or POSIX
conformance requested.
* libio/bits/stdio-ldbl.h (fscanf, scanf, sscanf, vfscanf, vscanf,
vsscanf): Redirect to __nldbl___isoc99_* if strict ISO C99 or POSIX
conformance requested.
* wcsmbs/bits/wchar-ldbl.h (fwscanf, wscanf, swscanf, vfwscanf,
vwscanf, vswscanf): Redirect to __nldbl___isoc99_* if strict
ISO C99 or POSIX conformance requested.
* stdio-common/Versions (libc): Export __isoc99_scanf@@GLIBC_2.7,
__isoc99_vscanf@@GLIBC_2.7, __isoc99_fscanf@@GLIBC_2.7,
__isoc99_vfscanf@@GLIBC_2.7, __isoc99_sscanf@@GLIBC_2.7
and __isoc99_vsscanf@@GLIBC_2.7.
* stdio-common/Makefile (routines): Add isoc99_scanf, isoc99_vscanf,
isoc99_fscanf, isoc99_vfscanf, isoc99_sscanf and isoc99_vsscanf.
(tests): Add scanf14.
(CFLAGS-vfprintf.c, CFLAGS-fprintf.c, CFLAGS-printf.c,
CFLAGS-vfwprintf.c, CFLAGS-vfscanf.c, CFLAGS-vfwscanf.c,
CFLAGS-fscanf.c, CFLAGS-scanf.c, CFLAGS-isoc99_vfscanf.c,
CFLAGS-isoc99_vscanf.c, CFLAGS-isoc99_fscanf.c,
CFLAGS-isoc99_scanf.c): Add $(exceptions).
(CFLAGS-scanf15.c): Add various -I paths to prevent the compiler
from using internal headers.
* wcsmbs/Versions (libc): Export __isoc99_wscanf@@GLIBC_2.7,
__isoc99_vwscanf@@GLIBC_2.7, __isoc99_fwscanf@@GLIBC_2.7,
__isoc99_vfwscanf@@GLIBC_2.7, __isoc99_swscanf@@GLIBC_2.7
and __isoc99_vswscanf@@GLIBC_2.7.
* wcsmbs/Makefile (routines): Add isoc99_wscanf, isoc99_vwscanf,
isoc99_fwscanf, isoc99_vfwscanf, isoc99_swscanf and isoc99_vswscanf.
(CFLAGS-isoc99_wscanf.c, CFLAGS-isoc99_fwscanf.c,
CFLAGS-isoc99_vwscanf.c, CFLAGS-isoc99_vfwscanf.c): Add $(exceptions).
(CPPFLAGS): Add -D_IO_MTSAFE_IO if needed.
* stdio-common/isoc99_scanf.c: New file.
* stdio-common/isoc99_vsscanf.c: New file.
* stdio-common/isoc99_vscanf.c: New file.
* stdio-common/isoc99_vfscanf.c: New file.
* stdio-common/isoc99_fscanf.c: New file.
* stdio-common/isoc99_sscanf.c: New file.
* wcsmbs/isoc99_fwscanf.c: New file.
* wcsmbs/isoc99_vswscanf.c: New file.
* wcsmbs/isoc99_swscanf.c: New file.
* wcsmbs/isoc99_wscanf.c: New file.
* wcsmbs/isoc99_vwscanf.c: New file.
* wcsmbs/isoc99_vfwscanf.c: New file.
* libio/libio.h (_IO_FLAGS2_SCANF_STD): Define.
* libio/libioP.h (_IO_acquire_lock_clear_flags2_fct): Also
clear _IO_FLAGS2_SCANF_STD bit from _flags2.
* stdio-common/vfscanf.c (_IO_vfscanf_internal): Don't
handle %as, %aS and %a[ if _IO_FLAGS2_SCANF_STD is set in _flags2.
* stdio-common/scanf14.c: New test.
* stdio-common/scanf15.c: New test.
* sysdeps/ieee754/ldbl-opt/Makefile (libnldbl-calls): Add
isoc99_scanf, isoc99_fscanf, isoc99_sscanf,
isoc99_vscanf, isoc99_vfscanf, isoc99_vsscanf,
isoc99_wscanf, isoc99_fwscanf, isoc99_swscanf,
isoc99_vwscanf, isoc99_vfwscanf and isoc99_vswscanf.
* sysdeps/ieee754/ldbl-opt/Versions (libc): Export
__nldbl___isoc99_scanf@@GLIBC_2.7,
__nldbl___isoc99_fscanf@@GLIBC_2.7,
__nldbl___isoc99_sscanf@@GLIBC_2.7,
__nldbl___isoc99_vscanf@@GLIBC_2.7,
__nldbl___isoc99_vfscanf@@GLIBC_2.7,
__nldbl___isoc99_vsscanf@@GLIBC_2.7,
__nldbl___isoc99_wscanf@@GLIBC_2.7,
__nldbl___isoc99_fwscanf@@GLIBC_2.7,
__nldbl___isoc99_swscanf@@GLIBC_2.7,
__nldbl___isoc99_vwscanf@@GLIBC_2.7,
__nldbl___isoc99_vfwscanf@@GLIBC_2.7
and __nldbl___isoc99_vswscanf@@GLIBC_2.7.
* sysdeps/ieee754/ldbl-opt/nldbl-compat.h (__isoc99_scanf,
__isoc99_fscanf, __isoc99_sscanf, __isoc99_vscanf,
__isoc99_vfscanf, __isoc99_vsscanf, __isoc99_wscanf,
__isoc99_fwscanf, __isoc99_swscanf, __isoc99_vwscanf,
__isoc99_vfwscanf, __isoc99_vswscanf): Add NLDBL_DECL.
* sysdeps/ieee754/ldbl-opt/nldbl-compat.c
(__nldbl___isoc99_scanf, __nldbl___isoc99_fscanf,
__nldbl___isoc99_sscanf, __nldbl___isoc99_vscanf,
__nldbl___isoc99_vfscanf, __nldbl___isoc99_vsscanf,
__nldbl___isoc99_wscanf, __nldbl___isoc99_fwscanf,
__nldbl___isoc99_swscanf, __nldbl___isoc99_vwscanf,
__nldbl___isoc99_vfwscanf, __nldbl___isoc99_vswscanf): New
functions.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_swscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vwscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_wscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_scanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_sscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vsscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fwscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfwscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vswscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vscanf.c: New file.
* sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fscanf.c: New file.
* stdio-common/Makefile (tests): Add scanf13.
(scanf13-ENV): New.
* stdio-common/vfscanf.c (_IO_vfscanf_internal): Handle
m modifier followed by l.
(STRING_ARG): Add width argument.
(_IO_vfscanf_internal) <case L_('c')>: Handle %mc.
<case L_('C')>: Handle %mlc and %mC.
<case L_('s'), case L_('S'), case L_('[')>: Adjust STRING_ARG
arguments.
* stdio-common/scanf13.c: New test.
* libio/libioP.h (_IO_acquire_lock_clear_flags2_fct): Clear
the _IO_FLAGS2_FORTIFY bit from _flags2 rather than _flags.
type and __THROW marker of splice, vmsplice, and tee.
|
||
|---|---|---|
| .. | ||
| bits | ||
| __fbufsize.c | ||
| __flbf.c | ||
| __fpending.c | ||
| __fpurge.c | ||
| __freadable.c | ||
| __freading.c | ||
| __fsetlocking.c | ||
| __fwritable.c | ||
| __fwriting.c | ||
| .cvsignore | ||
| 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 | ||
| bug-ungetc.c | ||
| bug-ungetwc1.c | ||
| bug-ungetwc2.c | ||
| bug-wfflush.c | ||
| bug-wmemstream1.c | ||
| clearerr_u.c | ||
| clearerr.c | ||
| Depend | ||
| fcloseall.c | ||
| feof_u.c | ||
| feof.c | ||
| ferror_u.c | ||
| ferror.c | ||
| filedoalloc.c | ||
| fileno.c | ||
| fileops.c | ||
| fmemopen.c | ||
| fputc_u.c | ||
| fputc.c | ||
| fputwc_u.c | ||
| fputwc.c | ||
| freopen64.c | ||
| freopen.c | ||
| fseek.c | ||
| fseeko64.c | ||
| fseeko.c | ||
| ftello64.c | ||
| ftello.c | ||
| fwide.c | ||
| fwprintf.c | ||
| fwscanf.c | ||
| genops.c | ||
| getc_u.c | ||
| getc.c | ||
| getchar_u.c | ||
| getchar.c | ||
| getwc_u.c | ||
| getwc.c | ||
| getwchar_u.c | ||
| getwchar.c | ||
| iofclose.c | ||
| iofdopen.c | ||
| iofflush_u.c | ||
| iofflush.c | ||
| iofgetpos64.c | ||
| iofgetpos.c | ||
| iofgets_u.c | ||
| iofgets.c | ||
| iofgetws_u.c | ||
| iofgetws.c | ||
| iofopen64.c | ||
| iofopen.c | ||
| iofopncook.c | ||
| iofputs_u.c | ||
| iofputs.c | ||
| iofputws_u.c | ||
| iofputws.c | ||
| iofread_u.c | ||
| iofread.c | ||
| iofsetpos64.c | ||
| iofsetpos.c | ||
| ioftell.c | ||
| iofwide.c | ||
| iofwrite_u.c | ||
| iofwrite.c | ||
| iogetdelim.c | ||
| iogetline.c | ||
| iogets.c | ||
| iogetwline.c | ||
| iolibio.h | ||
| iopadn.c | ||
| iopopen.c | ||
| ioputs.c | ||
| ioseekoff.c | ||
| ioseekpos.c | ||
| iosetbuffer.c | ||
| iosetvbuf.c | ||
| ioungetc.c | ||
| ioungetwc.c | ||
| iovdprintf.c | ||
| iovsprintf.c | ||
| iovsscanf.c | ||
| iovswscanf.c | ||
| iowpadn.c | ||
| libc_fatal.c | ||
| libio.h | ||
| libioP.h | ||
| Makefile | ||
| memstream.c | ||
| obprintf.c | ||
| oldfileops.c | ||
| oldiofclose.c | ||
| oldiofdopen.c | ||
| oldiofgetpos64.c | ||
| oldiofgetpos.c | ||
| oldiofopen.c | ||
| oldiofsetpos64.c | ||
| oldiofsetpos.c | ||
| oldiopopen.c | ||
| oldpclose.c | ||
| oldstdfiles.c | ||
| oldtmpfile.c | ||
| pclose.c | ||
| peekc.c | ||
| putc_u.c | ||
| putc.c | ||
| putchar_u.c | ||
| putchar.c | ||
| putwc_u.c | ||
| putwc.c | ||
| putwchar_u.c | ||
| putwchar.c | ||
| rewind.c | ||
| setbuf.c | ||
| setlinebuf.c | ||
| stdfiles.c | ||
| stdio.c | ||
| stdio.h | ||
| strfile.h | ||
| strops.c | ||
| swprintf.c | ||
| swscanf.c | ||
| test-fmemopen.c | ||
| test-freopen.c | ||
| test-freopen.sh | ||
| tst_getwc.c | ||
| tst_getwc.input | ||
| tst_putwc.c | ||
| tst_swprintf.c | ||
| tst_swscanf.c | ||
| tst_wprintf2.c | ||
| tst_wprintf.c | ||
| tst_wscanf.c | ||
| tst_wscanf.input | ||
| tst-atime.c | ||
| tst-eof.c | ||
| tst-ext.c | ||
| tst-fgetws.c | ||
| tst-fopenloc2.c | ||
| tst-fopenloc.c | ||
| tst-freopen.c | ||
| tst-memstream1.c | ||
| tst-memstream2.c | ||
| tst-mmap2-eofsync.c | ||
| tst-mmap-eofsync.c | ||
| tst-mmap-fflushsync.c | ||
| tst-mmap-offend.c | ||
| tst-mmap-setvbuf.c | ||
| tst-setvbuf1.c | ||
| tst-sscanf.c | ||
| tst-swscanf.c | ||
| tst-ungetwc1.c | ||
| tst-ungetwc2.c | ||
| tst-widetext.c | ||
| tst-widetext.input | ||
| tst-wmemstream1.c | ||
| tst-wmemstream2.c | ||
| vasprintf.c | ||
| Versions | ||
| vscanf.c | ||
| vsnprintf.c | ||
| vswprintf.c | ||
| vwprintf.c | ||
| vwscanf.c | ||
| wfiledoalloc.c | ||
| wfileops.c | ||
| wgenops.c | ||
| wmemstream.c | ||
| wprintf.c | ||
| wscanf.c | ||
| wstrops.c | ||