mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
655c069718
1999-06-18 Thorsten Kukuk <kukuk@suse.de> * sysdeps/alpha/atomicity.h: Correct counting of subsections. 1999-06-17 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * stdlib/tst-strtoll.c: Avoid warning about huge constant. 1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * stdio-common/vfprintf.c (group_member): Make parameters and return types pointers to CHAR_T instead of UCHAR_T. (vfprintf): Change type of work_buffer, workend and string to CHAR_T pointer/array. (process_arg, process_string_arg): Adjust/remove casts. Add missing use of L_ macro. (printf_unknown): Add missing uses of L_ macro. 1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * wcsmbs/wcschrnul.c: Explicitly cast return value to avoid warning. 1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * libio/wgenops.c (__wuflow): Fix use of WEOF vs. EOF. Call _IO_switch_to_wget_mode instead of _IO_switch_to_get_mode. (__wunderflow): Likewise. (_IO_switch_to_wget_mode): Likewise. (_IO_init_wmarker): Likewise. * libio/wfileops.c (_IO_wfile_seekoff): Call _IO_switch_to_wget_mode, not _IO_switch_to_get_mode. (_IO_wfile_jumps): Fix pbackfail entry. * libio/iosetvbuf.c (_IO_setvbuf): Only call wide char setbuf function if the stream is currently unoriented. 1999-06-19 Zack Weinberg <zack@rabi.columbia.edu> * wcsmbs/wchar.h: Define __need___va_list before including stdarg.h. Wrap all wide stream functions with #ifdef __USE_ISOC9X. Use __gnuc_va_list in v*w(printf|scanf) prototypes. 1999-06-20 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/oldiopopen.c (_IO_old_proc_open): Apply change from 1999-03-29 to iopopen also here. Reported by Richard Braakman <dark@xs4all.nl>. 1999-06-20 Andreas Jaeger <aj@arthur.rhein-neckar.de> * include/features.h: Use __GNUC_PREREQ. * sysdeps/i386/fpu/bits/mathinline.h: Likewise 1999-06-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * stdio-common/vfscanf.c (ungetc, inchar) [COMPILE_WPRINTF]: Change EOF to WEOF and remove cast. (UNGETC): Remove macro. (_IO_vfwscanf): Change isspace to ISSPACE and UNGETC to ungetc. * stdio-common/printf-parse.h (find_spec) [!COMPILE_WPRINTF]: Change ISASCII to isascii and MBRLEN to mbrlen. (parse_one_spec): Compare info.spec always against wchar_t values. * stdio-common/vfprintf.c: Remove unused ISASCII and MBRLEN. (_itoa, _itoa_word) [COMPILE_WRPINTF]: Don't cast second argument. (NOT_IN_JUMP_RANGE, CHAR_CLASS): Change (int) to (INT_T), use L_. 1999-06-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * libio/Makefile (shared-only-routines): Add oldiofgetpos, oldiofgetpos64, oldiofsetpos and oldiofsetpos64. (routines): Include oldiofgetpos, oldiofgetpos64, oldiofsetpos and oldiofsetpos64 only if doing versioning.
106 lines
3.2 KiB
C
106 lines
3.2 KiB
C
/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU IO Library.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License as
|
|
published by the Free Software Foundation; either version 2, or (at
|
|
your option) any later version.
|
|
|
|
This 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this library; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA.
|
|
|
|
As a special exception, if you link this library with files
|
|
compiled with a GNU compiler to produce an executable, this does
|
|
not cause the resulting executable to be covered by the GNU General
|
|
Public License. This exception does not however invalidate any
|
|
other reasons why the executable file might be covered by the GNU
|
|
General Public License. */
|
|
|
|
#include "libioP.h"
|
|
|
|
#define _IOFBF 0 /* Fully buffered. */
|
|
#define _IOLBF 1 /* Line buffered. */
|
|
#define _IONBF 2 /* No buffering. */
|
|
|
|
int
|
|
_IO_setvbuf (fp, buf, mode, size)
|
|
_IO_FILE *fp;
|
|
char *buf;
|
|
int mode;
|
|
_IO_size_t size;
|
|
{
|
|
int result;
|
|
CHECK_FILE (fp, EOF);
|
|
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
|
|
_IO_flockfile (fp);
|
|
switch (mode)
|
|
{
|
|
case _IOFBF:
|
|
fp->_IO_file_flags &= ~_IO_LINE_BUF|_IO_UNBUFFERED;
|
|
if (buf == NULL)
|
|
{
|
|
if (fp->_IO_buf_base == NULL)
|
|
{
|
|
/* There is no flag to distinguish between "fully buffered
|
|
mode has been explicitly set" as opposed to "line
|
|
buffering has not been explicitly set". In both
|
|
cases, _IO_LINE_BUF is off. If this is a tty, and
|
|
_IO_filedoalloc later gets called, it cannot know if
|
|
it should set the _IO_LINE_BUF flag (because that is
|
|
the default), or not (because we have explicitly asked
|
|
for fully buffered mode). So we make sure a buffer
|
|
gets allocated now, and explicitly turn off line
|
|
buffering.
|
|
|
|
A possibly cleaner alternative would be to add an
|
|
extra flag, but then flags are a finite resource. */
|
|
if (_IO_DOALLOCATE (fp) < 0)
|
|
{
|
|
result = EOF;
|
|
goto unlock_return;
|
|
}
|
|
fp->_IO_file_flags &= ~_IO_LINE_BUF;
|
|
}
|
|
result = 0;
|
|
goto unlock_return;
|
|
}
|
|
break;
|
|
case _IOLBF:
|
|
fp->_IO_file_flags &= ~_IO_UNBUFFERED;
|
|
fp->_IO_file_flags |= _IO_LINE_BUF;
|
|
if (buf == NULL)
|
|
{
|
|
result = 0;
|
|
goto unlock_return;
|
|
}
|
|
break;
|
|
case _IONBF:
|
|
buf = NULL;
|
|
size = 0;
|
|
break;
|
|
default:
|
|
result = EOF;
|
|
goto unlock_return;
|
|
}
|
|
result = _IO_SETBUF (fp, buf, size) == NULL ? EOF : 0;
|
|
if (result == 0 && fp->_mode == 0)
|
|
/* We also have to set the buffer using the wide char function. */
|
|
result = ((*fp->_wide_data->_wide_vtable->__setbuf) (fp, buf, size) == NULL
|
|
? EOF : 0);
|
|
unlock_return:
|
|
_IO_funlockfile (fp);
|
|
_IO_cleanup_region_end (0);
|
|
return result;
|
|
}
|
|
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_setvbuf, setvbuf)
|
|
#endif
|