mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
129d706d77
* libio/fileops.c (_IO_new_file_fopen): Correctly locate ccs= substring. Don't handle ccs= if no descriptor was allocated. Normalize codeset name before calling __wcsmbs_named_conv. Initialize transliteration elements. Free step data structure. * libio/iofclose.c (_IO_new_fclose): Correct freeing of the step data. * libio/iofwide.c (__libio_translit): Renamed from libio_translit and made public. Various little cleanup changes. * wcsmbs/wcsmbsload.h (struct gconv_fcts): Add towc_nsteps and tomb_nsteps member. * wcsmbs/wcsmbsload.c: Add some casts to avoid warnings. (__wcsmbs_gconv_fcts): Initialize towc_nsteps and tomb_nsteps member. (getfct): Take additional parameter with pointer to variable where the number of steps is stored in. Disable code which allows to use more than one step for now. Adjust all callers. (free_mem): New function. Frees data associated with currently selected converters.
96 lines
3.0 KiB
C
96 lines
3.0 KiB
C
/* Copyright (C) 1993,1995,1997-1999,2000,2001 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include "libioP.h"
|
|
#ifdef __STDC__
|
|
#include <stdlib.h>
|
|
#endif
|
|
#if _LIBC
|
|
# include "../iconv/gconv_int.h"
|
|
# include <shlib-compat.h>
|
|
#else
|
|
# define SHLIB_COMPAT(a, b, c) 0
|
|
# define _IO_new_fclose fclose
|
|
#endif
|
|
|
|
int
|
|
_IO_new_fclose (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
int status;
|
|
|
|
CHECK_FILE(fp, EOF);
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
|
|
/* We desperately try to help programs which are using streams in a
|
|
strange way and mix old and new functions. Detect old streams
|
|
here. */
|
|
if (fp->_vtable_offset != 0)
|
|
return _IO_old_fclose (fp);
|
|
#endif
|
|
|
|
/* First unlink the stream. */
|
|
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
|
|
_IO_un_link ((struct _IO_FILE_plus *) fp);
|
|
|
|
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
|
|
_IO_flockfile (fp);
|
|
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
|
|
status = _IO_file_close_it (fp);
|
|
else
|
|
status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
|
|
_IO_FINISH (fp);
|
|
_IO_funlockfile (fp);
|
|
if (fp->_mode > 0)
|
|
{
|
|
#if _LIBC
|
|
/* This stream has a wide orientation. This means we have to free
|
|
the conversion functions. */
|
|
struct _IO_codecvt *cc = fp->_codecvt;
|
|
|
|
__gconv_release_step (cc->__cd_in.__cd.__steps);
|
|
__gconv_release_step (cc->__cd_out.__cd.__steps);
|
|
#endif
|
|
}
|
|
_IO_cleanup_region_end (0);
|
|
if (_IO_have_backup (fp))
|
|
_IO_free_backup_area (fp);
|
|
if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
|
|
{
|
|
fp->_IO_file_flags = 0;
|
|
free(fp);
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
versioned_symbol (libc, _IO_new_fclose, _IO_fclose, GLIBC_2_1);
|
|
strong_alias (_IO_new_fclose, __new_fclose)
|
|
versioned_symbol (libc, __new_fclose, fclose, GLIBC_2_1);
|
|
#endif
|