diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-12-13 23:17:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-12-13 23:17:54 +0000 |
| commit | 1e88bd0f1b62bd58f283241877a0b3e66e199e76 (patch) | |
| tree | 5c7c36e5188e78363b6fb79df0b6b7a843511dbd /libio/fileops.c | |
| parent | f72386ad7c5009995612b4117a34de8c96d1509c (diff) | |
| download | glibc-1e88bd0f1b62bd58f283241877a0b3e66e199e76.tar.gz glibc-1e88bd0f1b62bd58f283241877a0b3e66e199e76.tar.xz glibc-1e88bd0f1b62bd58f283241877a0b3e66e199e76.zip | |
[BZ #2337]
2006-12-13 Ulrich Drepper <drepper@redhat.com> [BZ #2337] * libio/Makefile (tests): Add tst-setvbuf1. * libio/tst-setvbuf1.c: New file. 2006-12-08 Jakub Jelinek <jakub@redhat.com> [BZ #2337] * libio/genops.c (__uflow): Fix a typo. * libio/wfiledoalloc.c (_IO_wfile_doallocate): Don't stat nor set _IO_LINE_BUF bit here. Size the wide buffer based on the narrow buffer size. 2006-11-24 Jakub Jelinek <jakub@redhat.com> [BZ #2337] * libio/libio.h (_IO_FLAGS2_USER_WBUF): Define. * libio/wgenops.c (_IO_wsetb, _IO_wdefault_finish): Test and set _IO_FLAGS2_USER_WBUF bit in _flags2 instead of _IO_USER_BUF bit in _flags. * libio/wstrops.c (_IO_wstr_overflow, enlarge_userbuf, _IO_wstr_finish): Likewise. * libio/wmemstream.c (open_wmemstream): Likewise. * libio/fileops.c (_IO_new_file_close_it): Call _IO_set[bgp] even for wide streams.
Diffstat (limited to 'libio/fileops.c')
| -rw-r--r-- | libio/fileops.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index cf7fd65421..dbd7a7a8f2 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -174,14 +174,8 @@ _IO_new_file_close_it (fp) close_status = _IO_SYSCLOSE (fp); /* Free buffer. */ - if (fp->_mode <= 0) - { - INTUSE(_IO_setb) (fp, NULL, NULL, 0); - _IO_setg (fp, NULL, NULL, NULL); - _IO_setp (fp, NULL, NULL); - } #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T - else + if (fp->_mode > 0) { if (_IO_have_wbackup (fp)) INTUSE(_IO_free_wbackup_area) (fp); @@ -190,6 +184,9 @@ _IO_new_file_close_it (fp) _IO_wsetp (fp, NULL, NULL); } #endif + INTUSE(_IO_setb) (fp, NULL, NULL, 0); + _IO_setg (fp, NULL, NULL, NULL); + _IO_setp (fp, NULL, NULL); INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp); fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS; |