mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +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.
130 lines
4.8 KiB
Makefile
130 lines
4.8 KiB
Makefile
# Copyright (C) 1991-2006, 2007 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Specific makefile for stdio-common.
|
|
#
|
|
subdir := stdio-common
|
|
|
|
headers := stdio_ext.h printf.h bits/printf-ldbl.h
|
|
|
|
routines := \
|
|
ctermid cuserid \
|
|
_itoa _itowa itoa-digits itoa-udigits itowa-digits \
|
|
vfprintf vprintf printf_fp reg-printf printf-prs printf_fphex \
|
|
printf_size fprintf printf snprintf sprintf asprintf dprintf \
|
|
vfwprintf vfscanf vfwscanf \
|
|
fscanf scanf sscanf \
|
|
perror psignal \
|
|
tmpfile tmpfile64 tmpnam tmpnam_r tempnam tempname \
|
|
getline getw putw \
|
|
remove rename renameat \
|
|
flockfile ftrylockfile funlockfile \
|
|
isoc99_scanf isoc99_vscanf isoc99_fscanf isoc99_vfscanf isoc99_sscanf \
|
|
isoc99_vsscanf
|
|
|
|
install-others = $(inst_includedir)/bits/stdio_lim.h
|
|
|
|
include ../Makeconfig
|
|
|
|
aux := errlist siglist printf-parsemb printf-parsewc fxprintf
|
|
distribute := _itoa.h _itowa.h _i18n_number.h \
|
|
printf-parse.h stdio_lim.h.in tst-unbputc.sh tst-printf.sh
|
|
|
|
tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
|
|
temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
|
|
xbug errnobug \
|
|
bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 bug13 \
|
|
tfformat tiformat tllformat tstdiomisc tst-printfsz tst-wc-printf \
|
|
scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
|
|
scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
|
|
tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
|
|
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
|
|
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
|
|
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
|
|
bug19 bug19a tst-popen2 scanf13 scanf14 scanf15
|
|
|
|
test-srcs = tst-unbputc tst-printf
|
|
|
|
include ../Rules
|
|
|
|
$(inst_includedir)/bits/stdio_lim.h: $(common-objpfx)bits/stdio_lim.h $(+force)
|
|
$(do-install)
|
|
|
|
ifeq ($(cross-compiling),no)
|
|
.PHONY: do-tst-unbputc do-tst-printf
|
|
tests: do-tst-unbputc do-tst-printf
|
|
|
|
do-tst-unbputc: $(objpfx)tst-unbputc.out
|
|
$(objpfx)tst-unbputc.out: $(objpfx)tst-unbputc tst-unbputc.sh
|
|
$(SHELL) -e tst-unbputc.sh $(common-objpfx) '$(run-program-prefix)'
|
|
|
|
do-tst-printf: $(objpfx)tst-printf.out
|
|
$(objpfx)tst-printf.out: $(objpfx)tst-printf tst-printf.sh
|
|
$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
|
|
endif
|
|
|
|
CFLAGS-vfprintf.c = -Wno-uninitialized
|
|
CFLAGS-vfwprintf.c = -Wno-uninitialized
|
|
CFLAGS-tst-printf.c = -Wno-format
|
|
CFLAGS-tstdiomisc.c = -Wno-format
|
|
CFLAGS-scanf4.c = -Wno-format
|
|
CFLAGS-scanf7.c = -Wno-format
|
|
CFLAGS-tst-printfsz.c = -Wno-format
|
|
|
|
CFLAGS-tmpfile.c = -fexceptions
|
|
CFLAGS-tmpfile64.c = -fexceptions
|
|
CFLAGS-tempname.c = -fexceptions
|
|
CFLAGS-psignal.c = -fexceptions
|
|
CFLAGS-vprintf.c = -fexceptions
|
|
CFLAGS-cuserid.c = -fexceptions
|
|
|
|
CFLAGS-vfprintf.c += $(exceptions)
|
|
CFLAGS-fprintf.c += $(exceptions)
|
|
CFLAGS-printf.c += $(exceptions)
|
|
CFLAGS-vfwprintf.c += $(exceptions)
|
|
CFLAGS-vfscanf.c += $(exceptions)
|
|
CFLAGS-vfwscanf.c += $(exceptions)
|
|
CFLAGS-fscanf.c += $(exceptions)
|
|
CFLAGS-scanf.c += $(exceptions)
|
|
CFLAGS-isoc99_vfscanf.c += $(exceptions)
|
|
CFLAGS-isoc99_vscanf.c += $(exceptions)
|
|
CFLAGS-isoc99_fscanf.c += $(exceptions)
|
|
CFLAGS-isoc99_scanf.c += $(exceptions)
|
|
CFLAGS-errlist.c = $(fno-unit-at-a-time)
|
|
CFLAGS-siglist.c = $(fno-unit-at-a-time)
|
|
|
|
# The following is a hack since we must compile scanf15.c without any
|
|
# GNU extension. The latter are needed, though, when internal headers
|
|
# are used. So made sure we see the installed headers first.
|
|
CFLAGS-scanf15.c = -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
|
|
-I../wctype
|
|
|
|
# We know the test has a format string problem.
|
|
CFLAGS-tst-sprintf.c = -Wno-format
|
|
tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-swprintf-ENV = LOCPATH=$(common-objpfx)localedata
|
|
test-vfprintf-ENV = LOCPATH=$(common-objpfx)localedata
|
|
scanf13-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug14-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug15-ENV = LOCPATH=$(common-objpfx)localedata
|
|
|
|
ifneq (,$(filter %REENTRANT, $(defines)))
|
|
CPPFLAGS += -D_IO_MTSAFE_IO
|
|
endif
|