mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
[BZ #1078]
2005-09-27 Ulrich Drepper <drepper@redhat.com> [BZ #1078] * libio/fileops.c (_IO_new_file_xsputn): Determine amount of available space in non-line-buffered buffer correctly. * libio/oldfileops.c (_IO_old_file_xsputn): Likewise. * stdio-common/Makefile (tests): Add tst-fwrite. * stdio-common/tst-fwrite.c: New file.
This commit is contained in:
@ -1281,7 +1281,7 @@ _IO_new_file_xsputn (f, data, n)
|
||||
register const char *s = (const char *) data;
|
||||
_IO_size_t to_do = n;
|
||||
int must_flush = 0;
|
||||
_IO_size_t count;
|
||||
_IO_size_t count = 0;
|
||||
|
||||
if (n <= 0)
|
||||
return 0;
|
||||
@ -1290,7 +1290,6 @@ _IO_new_file_xsputn (f, data, n)
|
||||
(or the filebuf is unbuffered), use sys_write directly. */
|
||||
|
||||
/* First figure out how much space is available in the buffer. */
|
||||
count = f->_IO_write_end - f->_IO_write_ptr; /* Space available. */
|
||||
if ((f->_flags & _IO_LINE_BUF) && (f->_flags & _IO_CURRENTLY_PUTTING))
|
||||
{
|
||||
count = f->_IO_buf_end - f->_IO_write_ptr;
|
||||
@ -1308,6 +1307,9 @@ _IO_new_file_xsputn (f, data, n)
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (f->_IO_write_end > f->_IO_write_ptr)
|
||||
count = f->_IO_write_end - f->_IO_write_ptr; /* Space available. */
|
||||
|
||||
/* Then fill the buffer. */
|
||||
if (count > 0)
|
||||
{
|
||||
|
Reference in New Issue
Block a user