mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 22:10:13 +00:00
2cc7bad0ae
C99 specifies that the EOF condition on a file is "sticky": once EOF has been encountered, all subsequent reads should continue to return EOF until the file is closed or something clears the "end-of-file indicator" (e.g. fseek, clearerr). This is arguably a change from C89, where the wording was ambiguous; the BSDs always had sticky EOF, but the System V lineage would attempt to read from the underlying fd again. GNU libc has followed System V for as long as we've been using libio, but nowadays C99 conformance and BSD compatibility are more important than System V compatibility. You might wonder if changing the _underflow impls is sufficient to apply the C99 semantics to all of the many stdio functions that perform input. It should be enough to cover all paths to _IO_SYSREAD, and the only other functions that call _IO_SYSREAD are the _seekoff impls, which is OK because seeking clears EOF, and the _xsgetn impls, which, as far as I can tell, are unused within glibc. The test programs in this patch use a pseudoterminal to set up the necessary conditions. To facilitate this I added a new test-support function that sets up a pair of pty file descriptors for you; it's almost the same as BSD openpty, the only differences are that it allocates the optionally-returned tty pathname with malloc, and that it crashes if anything goes wrong. [BZ #1190] [BZ #19476] * libio/fileops.c (_IO_new_file_underflow): Return EOF immediately if the _IO_EOF_SEEN bit is already set; update commentary. * libio/oldfileops.c (_IO_old_file_underflow): Likewise. * libio/wfileops.c (_IO_wfile_underflow): Likewise. * support/support_openpty.c, support/tty.h: New files. * support/Makefile (libsupport-routines): Add support_openpty. * libio/tst-fgetc-after-eof.c, wcsmbs/test-fgetwc-after-eof.c: New test cases. * libio/Makefile (tests): Add tst-fgetc-after-eof. * wcsmbs/Makefile (tests): Add tst-fgetwc-after-eof.
108 lines
3.9 KiB
Makefile
108 lines
3.9 KiB
Makefile
# Copyright (C) 1995-2018 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, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Sub-makefile for wcsmbs portion of the library.
|
|
#
|
|
subdir := wcsmbs
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h uchar.h \
|
|
bits/types/__mbstate_t.h bits/types/mbstate_t.h bits/types/wint_t.h
|
|
|
|
routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
|
|
wcsncmp wcsncpy wcspbrk wcsrchr wcsspn wcstok wcsstr wmemchr \
|
|
wmemcmp wmemcpy wmemmove wmemset wcpcpy wcpncpy wmempcpy \
|
|
btowc wctob mbsinit \
|
|
mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \
|
|
mbsnrtowcs wcsnrtombs wcsnlen wcschrnul \
|
|
wcstol wcstoul wcstoll wcstoull wcstod wcstold wcstof \
|
|
wcstol_l wcstoul_l wcstoll_l wcstoull_l \
|
|
wcstod_l wcstold_l wcstof_l \
|
|
wcstod_nan wcstold_nan wcstof_nan \
|
|
wcscoll wcsxfrm \
|
|
wcwidth wcswidth \
|
|
wcscoll_l wcsxfrm_l \
|
|
wcscasecmp wcsncase wcscasecmp_l wcsncase_l \
|
|
wcsmbsload mbsrtowcs_l \
|
|
isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \
|
|
isoc99_swscanf isoc99_vswscanf \
|
|
mbrtoc16 c16rtomb
|
|
|
|
strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \
|
|
wcpcpy wcsncpy wcpncpy wcscat wcsncat wcschrnul wcsspn wcspbrk \
|
|
wcscspn wmemchr wmemset
|
|
tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
|
|
tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \
|
|
tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \
|
|
tst-wcstod-round test-char-types tst-fgetwc-after-eof \
|
|
$(addprefix test-,$(strop-tests))
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 hr_HR.ISO-8859-2 \
|
|
ja_JP.EUC-JP zh_TW.EUC-TW tr_TR.UTF-8 tr_TR.ISO-8859-9
|
|
include ../gen-locales.mk
|
|
|
|
$(objpfx)tst-btowc.out: $(gen-locales)
|
|
$(objpfx)tst-c16c32-1.out: $(gen-locales)
|
|
$(objpfx)tst-mbrtowc.out: $(gen-locales)
|
|
$(objpfx)tst-mbrtowc2.out: $(gen-locales)
|
|
$(objpfx)tst-wcrtomb.out: $(gen-locales)
|
|
$(objpfx)wcsmbs-tst1.out: $(gen-locales)
|
|
$(objpfx)tst-wcstol-locale.out: $(gen-locales)
|
|
$(objpfx)tst-wcstod-nan-locale.out: $(gen-locales)
|
|
endif
|
|
|
|
$(objpfx)tst-wcstod-round: $(libm)
|
|
|
|
CFLAGS-wcwidth.c += -I../wctype
|
|
CFLAGS-wcswidth.c += -I../wctype
|
|
|
|
strtox-CFLAGS = -I../include
|
|
CFLAGS-wcstol.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstoul.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstoll.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstoull.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstod.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstold.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstof128.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstof.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstol_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstoul_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstoll_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstoull_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstod_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstold_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstof128_l.c += $(strtox-CFLAGS)
|
|
CFLAGS-wcstof_l.c += $(strtox-CFLAGS)
|
|
CPPFLAGS-tst-wchar-h.c += -D_FORTIFY_SOURCE=2
|
|
|
|
CFLAGS-isoc99_wscanf.c += -fexceptions
|
|
CFLAGS-isoc99_fwscanf.c += -fexceptions
|
|
CFLAGS-isoc99_vwscanf.c += -fexceptions
|
|
CFLAGS-isoc99_vfwscanf.c += -fexceptions
|
|
|
|
CPPFLAGS += $(libio-mtsafe)
|
|
|
|
# We need to find the default version of strtold_l in stdlib.
|
|
CPPFLAGS-wcstold_l.c += -I../stdlib
|
|
|
|
$(objpfx)tst-wcstod-nan-locale: $(libm)
|