i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libroot: Clean up fpurge implementation.

Browse Source 
* Take it from upstream glibc 2.15, much closer to the version we use.

 * Drop fpurge from stdio.h, it's nonstandard. Keep it around for
   ABI compatibility for now (BeOS didn't have it.) __fpurge is left
   in stdio_ext.h.
This commit is contained in:
Augustin Cavalier
2025-03-18 22:03:10 -04:00
parent 802a83e7ed
commit 0796aaabfc
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/stdio.h
-1
View File
@@ -120,7 +120,6 @@ extern FILE *fopencookie(void *cookie, const char *mode, cookie_io_functions_t
/* file I/O */ /* file I/O */
extern int fflush(FILE *stream); extern int fflush(FILE *stream);
extern int fflush_unlocked(FILE *stream); extern int fflush_unlocked(FILE *stream);
extern int fpurge(FILE *stream);
extern int fgetpos(FILE *stream, fpos_t *position); extern int fgetpos(FILE *stream, fpos_t *position);
extern int fsetpos(FILE *stream, const fpos_t *position); extern int fsetpos(FILE *stream, const fpos_t *position);
src/system/libroot/posix/glibc/libio/__fpurge.c
+16 -7
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2000-2014 Free Software Foundation, Inc. /* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,11 @@
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, write to the Free
<http://www.gnu.org/licenses/>. */ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <stdlib.h>
#include <stdio_ext.h> #include <stdio_ext.h>
#include "libioP.h" #include "libioP.h"
@@ -25,7 +27,7 @@ __fpurge (FILE *fp)
{ {
/* Wide-char stream. */ /* Wide-char stream. */
if (_IO_in_backup (fp)) if (_IO_in_backup (fp))
_IO_free_wbackup_area (fp); INTUSE(_IO_free_wbackup_area) (fp);
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_read_ptr; fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_read_ptr;
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_base; fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_base;
@@ -34,16 +36,23 @@ __fpurge (FILE *fp)
{ {
/* Byte stream. */ /* Byte stream. */
if (_IO_in_backup (fp)) if (_IO_in_backup (fp))
_IO_free_backup_area (fp); INTUSE(_IO_free_backup_area) (fp);
fp->_IO_read_end = fp->_IO_read_ptr; fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base; fp->_IO_write_ptr = fp->_IO_write_base;
} }
/* Avoid memory leak when there is an active ungetc buffer. */
if (fp->_IO_save_base != NULL)
{
free (fp->_IO_save_base);
fp->_IO_save_base = NULL;
}
} }
int int
fpurge(FILE* stream) fpurge(FILE* stream)
{ {
__fpurge(stream); __fpurge(stream);
return 0; return 0;
} }