OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

* libio/Makefile (routines): Add fwide.
	* libio/iofwide.c (_IO_fwide): Remove locking.  This is done in
	fwide now.  Internal calls to _IO_fwide must do locking themselves
	or don't need locking.
	* libio/fwide.c: New file.

	* elf/dl-load.c (_dl_map_object): Implement handling of DF_1_NODEFLIB.
This commit is contained in:
Ulrich Drepper 2000-07-21 06:15:13 +00:00
parent 266bb989e0
commit d052b31b79
4 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,7 +1,12 @@
2000-07-20 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_map_object): Implement handling of
DF_1_NODEFLIB.
* libio/Makefile (routines): Add fwide.
* libio/iofwide.c (_IO_fwide): Remove locking. This is done in
fwide now. Internal calls to _IO_fwide must do locking themselves
or don't need locking.
* libio/fwide.c: New file.
* elf/dl-load.c (_dl_map_object): Implement handling of DF_1_NODEFLIB.
* elf/Makefile: Add no modules for nodelete test.
* elf/nodelmod3.c: New file.

2
libio/Makefile
View File

@ -34,7 +34,7 @@ routines := \
iofputws iofputws_u iogetwline iowpadn ioungetwc putwc putwc_u \
putwchar putwchar_u putchar putchar_u fwprintf swprintf vwprintf \
wprintf wscanf fwscanf vwscanf vswprintf iovswscanf swscanf wgenops \
wstrops wfileops iofwide \
wstrops wfileops iofwide fwide \
\
clearerr feof ferror fileno fputc freopen fseek getc getchar \
memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \

53
libio/fwide.c Normal file
View File

@ -0,0 +1,53 @@
/* Copyright (C) 1999, 2000 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>
#include <stdio.h>
int
fwide (fp, mode)
_IO_FILE *fp;
int mode;
{
int result;
/* Normalize the value. */
mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1);
if (mode == 0 || fp->_mode != 0)
/* The caller simply wants to know about the current orientation
or the orientation already has been determined. */
return fp->_mode;
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
_IO_flockfile (fp);
result = _IO_fwide (fp, mode);
_IO_funlockfile (fp);
_IO_cleanup_region_end (0);
return result;
}

6
libio/iofwide.c
View File

@ -92,9 +92,6 @@ _IO_fwide (fp, mode)
or the orientation already has been determined. */
return fp->_mode;
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
_IO_flockfile (fp);
/* Set the orientation appropriately. */
if (mode > 0)
{
@ -150,9 +147,6 @@ _IO_fwide (fp, mode)
/* Set the mode now. */
fp->_mode = mode;
_IO_funlockfile (fp);
_IO_cleanup_region_end (0);
return mode;
}