mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-28 23:34:53 +03:00 
			
		
		
		
	* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out. (_IO_FILE): Declare chain as (struct _IO_FILE_plus *). * libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in. (_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *). (_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to THIS, since _IO_JUMPS no longer does it implicitly. (_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/strops.c (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/fileops.c (_IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). * libio/oldfileops.c (_IO_old_file_init): Likewise. * libio/genops.c (_IO_link_in, _IO_un_link): Likewise. (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write): Declare iteration pointer as (struct _IO_FILE_plus *). (_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *). * libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *). * libio/oldstdfiles.c (_IO_list_all): Likewise. (_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *). * libio/stdio.c (stdin, stdout, stderr): Set user-visible handles to (struct _IO_FILE_plus *). * libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer whose high bound includes vtable to all functions that will use vtable. For streambufs, pass pointer whose bounds include struct _IO_strfile. * libio/wgenops.c (_IO_wdefault_finish): Likewise. * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. * libio/iofopen.c (_IO_new_fopen): Likewise. * libio/oldiofopen.c (_IO_old_fopen): Likewise. * libio/iofopen64.c (_IO_fopen64): Likewise. * libio/iopopen.c (_IO_new_popen): Likewise. * libio/oldiopopen.c (_IO_old_popen): Likewise. * libio/memstream.c (open_memstream): Likewise. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * libio/iovsprintf.c (_IO_vsprintf): Likewise. * libio/iovdprintf.c (_IO_vdprintf): Likewise. * libio/iofopncook.c (_IO_cookie_init): Likewise. * libio/obprintf.c (_IO_obstack_vprintf): Likewise. * libio/vasprintf.c (_IO_vasprintf): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * stdlib/strfmon.c (__strfmon_l): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf): Likewise. (vfprintf): Qualify computed-goto targets as unbounded. 2000-06-28 Greg McGary <greg@mcgary.org> * libio/libio.h (struct _IO_cookie_file): Move struct type defintion out. (_IO_FILE): Declare chain as (struct _IO_FILE_plus *). * libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in. (_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *). (_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to THIS, since _IO_JUMPS no longer does it implicitly. (_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/strops.c (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/fileops.c (_IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). * libio/oldfileops.c (_IO_old_file_init): Likewise. * libio/genops.c (_IO_link_in, _IO_un_link): Likewise. (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write): Declare iteration pointer as (struct _IO_FILE_plus *). (_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *). * libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *). * libio/oldstdfiles.c (_IO_list_all): Likewise. (_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *). * libio/stdio.c (stdin, stdout, stderr): Set user-visible handles to (struct _IO_FILE_plus *). * libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer whose high bound includes vtable to all functions that will use vtable. For streambufs, pass pointer whose bounds include struct _IO_strfile. * libio/wgenops.c (_IO_wdefault_finish): Likewise. * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. * libio/iofopen.c (_IO_new_fopen): Likewise. * libio/oldiofopen.c (_IO_old_fopen): Likewise. * libio/iofopen64.c (_IO_fopen64): Likewise. * libio/iopopen.c (_IO_new_popen): Likewise. * libio/oldiopopen.c (_IO_old_popen): Likewise. * libio/memstream.c (open_memstream): Likewise. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * libio/iovsprintf.c (_IO_vsprintf): Likewise. * libio/iovdprintf.c (_IO_vdprintf): Likewise. * libio/iofopncook.c (_IO_cookie_init): Likewise. * libio/obprintf.c (_IO_obstack_vprintf): Likewise. * libio/vasprintf.c (_IO_vasprintf): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * stdlib/strfmon.c (__strfmon_l): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf): Likewise. (vfprintf): Qualify computed-goto targets as unbounded.
		
			
				
	
	
		
			226 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			226 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (C) 1995, 1996, 1997, 1999, 2000 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 Library General Public License as
 | |
|    published by the Free Software Foundation; either version 2 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
 | |
|    Library General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU Library General Public
 | |
|    License along with the GNU C Library; see the file COPYING.LIB.  If not,
 | |
|    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 | |
|    Boston, MA 02111-1307, USA.  */
 | |
| 
 | |
| #include "libioP.h"
 | |
| #include "strfile.h"
 | |
| #include <stdio.h>
 | |
| #include <stdlib.h>
 | |
| 
 | |
| 
 | |
| struct _IO_FILE_memstream
 | |
| {
 | |
|   _IO_strfile _sf;
 | |
|   char **bufloc;
 | |
|   _IO_size_t *sizeloc;
 | |
| };
 | |
| 
 | |
| 
 | |
| static int _IO_mem_sync __P ((_IO_FILE* fp));
 | |
| static void _IO_mem_finish __P ((_IO_FILE* fp, int));
 | |
| static int _IO_wmem_sync __P ((_IO_FILE* fp));
 | |
| static void _IO_wmem_finish __P ((_IO_FILE* fp, int));
 | |
| 
 | |
| 
 | |
| static struct _IO_jump_t _IO_mem_jumps =
 | |
| {
 | |
|   JUMP_INIT_DUMMY,
 | |
|   JUMP_INIT (finish, _IO_mem_finish),
 | |
|   JUMP_INIT (overflow, _IO_str_overflow),
 | |
|   JUMP_INIT (underflow, _IO_str_underflow),
 | |
|   JUMP_INIT (uflow, _IO_default_uflow),
 | |
|   JUMP_INIT (pbackfail, _IO_str_pbackfail),
 | |
|   JUMP_INIT (xsputn, _IO_default_xsputn),
 | |
|   JUMP_INIT (xsgetn, _IO_default_xsgetn),
 | |
|   JUMP_INIT (seekoff, _IO_str_seekoff),
 | |
|   JUMP_INIT (seekpos, _IO_default_seekpos),
 | |
|   JUMP_INIT (setbuf, _IO_default_setbuf),
 | |
|   JUMP_INIT (sync, _IO_mem_sync),
 | |
|   JUMP_INIT (doallocate, _IO_default_doallocate),
 | |
|   JUMP_INIT (read, _IO_default_read),
 | |
|   JUMP_INIT (write, _IO_default_write),
 | |
|   JUMP_INIT (seek, _IO_default_seek),
 | |
|   JUMP_INIT (close, _IO_default_close),
 | |
|   JUMP_INIT (stat, _IO_default_stat),
 | |
|   JUMP_INIT(showmanyc, _IO_default_showmanyc),
 | |
|   JUMP_INIT(imbue, _IO_default_imbue)
 | |
| };
 | |
| 
 | |
| static struct _IO_jump_t _IO_wmem_jumps =
 | |
| {
 | |
|   JUMP_INIT_DUMMY,
 | |
|   JUMP_INIT (finish, (_IO_finish_t) _IO_wmem_finish),
 | |
|   JUMP_INIT (overflow, (_IO_overflow_t) _IO_wstr_overflow),
 | |
|   JUMP_INIT (underflow, (_IO_underflow_t) _IO_wstr_underflow),
 | |
|   JUMP_INIT (uflow, (_IO_underflow_t) _IO_wdefault_uflow),
 | |
|   JUMP_INIT (pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
 | |
|   JUMP_INIT (xsputn, (_IO_xsputn_t) _IO_wdefault_xsputn),
 | |
|   JUMP_INIT (xsgetn, (_IO_xsgetn_t) _IO_wdefault_xsgetn),
 | |
|   JUMP_INIT (seekoff, _IO_wstr_seekoff),
 | |
|   JUMP_INIT (seekpos, _IO_default_seekpos),
 | |
|   JUMP_INIT (setbuf, (_IO_setbuf_t) _IO_wdefault_setbuf),
 | |
|   JUMP_INIT (sync, (_IO_sync_t) _IO_wmem_sync),
 | |
|   JUMP_INIT (doallocate, _IO_wdefault_doallocate),
 | |
|   JUMP_INIT (read, _IO_default_read),
 | |
|   JUMP_INIT (write, _IO_default_write),
 | |
|   JUMP_INIT (seek, _IO_default_seek),
 | |
|   JUMP_INIT (close, _IO_default_close),
 | |
|   JUMP_INIT (stat, _IO_default_stat),
 | |
|   JUMP_INIT(showmanyc, _IO_default_showmanyc),
 | |
|   JUMP_INIT(imbue, _IO_default_imbue)
 | |
| };
 | |
| 
 | |
| /* Open a stream that writes into a malloc'd buffer that is expanded as
 | |
|    necessary.  *BUFLOC and *SIZELOC are updated with the buffer's location
 | |
|    and the number of characters written on fflush or fclose.  */
 | |
| _IO_FILE *
 | |
| open_memstream (bufloc, sizeloc)
 | |
|      char **bufloc;
 | |
|      _IO_size_t *sizeloc;
 | |
| {
 | |
|   struct locked_FILE
 | |
|   {
 | |
|     struct _IO_FILE_memstream fp;
 | |
| #ifdef _IO_MTSAFE_IO
 | |
|     _IO_lock_t lock;
 | |
| #endif
 | |
|     struct _IO_wide_data wd;
 | |
|   } *new_f;
 | |
|   char *buf;
 | |
| 
 | |
|   new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
 | |
|   if (new_f == NULL)
 | |
|     return NULL;
 | |
| #ifdef _IO_MTSAFE_IO
 | |
|   new_f->fp._sf._sbf._f._lock = &new_f->lock;
 | |
| #endif
 | |
| 
 | |
|   buf = malloc (_IO_BUFSIZ);
 | |
|   if (buf == NULL)
 | |
|     return NULL;
 | |
|   _IO_no_init (&new_f->fp._sf._sbf._f, 0, 0, &new_f->wd, &_IO_wmem_jumps);
 | |
|   _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps;
 | |
|   _IO_str_init_static (&new_f->fp._sf, buf, _IO_BUFSIZ, buf);
 | |
|   new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF;
 | |
|   new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc;
 | |
|   new_f->fp._sf._s._free_buffer = (_IO_free_type) free;
 | |
| 
 | |
|   new_f->fp.bufloc = bufloc;
 | |
|   new_f->fp.sizeloc = sizeloc;
 | |
| 
 | |
|   return (_IO_FILE *) &new_f->fp._sf._sbf;
 | |
| }
 | |
| 
 | |
| 
 | |
| static int
 | |
| _IO_mem_sync (fp)
 | |
|      _IO_FILE* fp;
 | |
| {
 | |
|   struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
 | |
|   int res;
 | |
| 
 | |
|   res = _IO_default_sync (fp);
 | |
|   if (res < 0)
 | |
|     return res;
 | |
| 
 | |
|   if (fp->_IO_write_ptr == fp->_IO_write_end)
 | |
|     {
 | |
|       _IO_str_overflow (fp, '\0');
 | |
|       --fp->_IO_write_ptr;
 | |
|     }
 | |
|   else
 | |
|     *fp->_IO_write_ptr = '\0';
 | |
| 
 | |
|   *mp->bufloc = fp->_IO_write_base;
 | |
|   *mp->sizeloc = fp->_IO_write_ptr - fp->_IO_write_base;
 | |
| 
 | |
|   return 0;
 | |
| }
 | |
| 
 | |
| 
 | |
| static void
 | |
| _IO_mem_finish (fp, dummy)
 | |
|      _IO_FILE* fp;
 | |
|      int dummy;
 | |
| {
 | |
|   struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
 | |
| 
 | |
|   *mp->bufloc = (char *) realloc (fp->_IO_write_base,
 | |
| 				  fp->_IO_write_ptr - fp->_IO_write_base + 1);
 | |
|   if (*mp->bufloc != NULL)
 | |
|     {
 | |
|       (*mp->bufloc)[fp->_IO_write_ptr - fp->_IO_write_base] = '\0';
 | |
|       *mp->sizeloc = fp->_IO_write_ptr - fp->_IO_write_base;
 | |
|     }
 | |
| 
 | |
|   fp->_IO_buf_base = NULL;
 | |
| 
 | |
|   _IO_default_finish (fp, 0);
 | |
| }
 | |
| 
 | |
| 
 | |
| static int
 | |
| _IO_wmem_sync (fp)
 | |
|      _IO_FILE* fp;
 | |
| {
 | |
|   struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
 | |
|   int res;
 | |
| 
 | |
|   res = _IO_default_sync (fp);
 | |
|   if (res < 0)
 | |
|     return res;
 | |
| 
 | |
|   if (fp->_wide_data->_IO_write_ptr == fp->_wide_data->_IO_write_end)
 | |
|     {
 | |
|       _IO_wstr_overflow (fp, L'\0');
 | |
|       --fp->_wide_data->_IO_write_ptr;
 | |
|     }
 | |
|   else
 | |
|     *fp->_wide_data->_IO_write_ptr = '\0';
 | |
| 
 | |
|   *mp->bufloc = (char *) fp->_wide_data->_IO_write_base;
 | |
|   *mp->sizeloc = (fp->_wide_data->_IO_write_ptr
 | |
| 		  - fp->_wide_data->_IO_write_base);
 | |
| 
 | |
|   return 0;
 | |
| }
 | |
| 
 | |
| 
 | |
| static void
 | |
| _IO_wmem_finish (fp, dummy)
 | |
|      _IO_FILE* fp;
 | |
|      int dummy;
 | |
| {
 | |
|   struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
 | |
| 
 | |
|   *mp->bufloc = (char *) realloc (fp->_wide_data->_IO_write_base,
 | |
| 				  (fp->_wide_data->_IO_write_ptr
 | |
| 				   - fp->_wide_data->_IO_write_base + 1)
 | |
| 				  * sizeof (wchar_t));
 | |
|   if (*mp->bufloc != NULL)
 | |
|     {
 | |
|       ((wchar_t *) (*mp->bufloc))[fp->_wide_data->_IO_write_ptr
 | |
| 				 - fp->_wide_data->_IO_write_base] = '\0';
 | |
|       *mp->sizeloc = (fp->_wide_data->_IO_write_ptr
 | |
| 		      - fp->_wide_data->_IO_write_base);
 | |
|     }
 | |
| 
 | |
|   fp->_wide_data->_IO_buf_base = NULL;
 | |
| 
 | |
|   _IO_default_finish (fp, 0);
 | |
| }
 |