AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 04:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2003-05-06  Ulrich Drepper  <drepper@redhat.com>

	* libio/oldiofdopen.c (_IO_old_fdopen): Use _IO_old_init not _IO_init.
	* libio/oldiofopen.c (_IO_old_fopen): Likewise.
	* libio/libioP.h: Declare _IO_old_init.
	* libio/genops.c (_IO_no_init): Split in two.  New function
	_IO_old_init.
This commit is contained in:
Ulrich Drepper 2003-05-07 03:48:45 +00:00
parent 445506e341
commit 14a2bd4b6d
7 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2003-05-06 Ulrich Drepper <drepper@redhat.com>
* libio/oldiofdopen.c (_IO_old_fdopen): Use _IO_old_init not _IO_init.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/libioP.h: Declare _IO_old_init.
* libio/genops.c (_IO_no_init): Split in two. New function
_IO_old_init.
2003-05-05 Ulrich Drepper <drepper@redhat.com> 2003-05-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/enbl-secure.c (__libc_enable_secure_decided): New * sysdeps/generic/enbl-secure.c (__libc_enable_secure_decided): New

16
libio/genops.c
View File

@ -602,12 +602,9 @@ _IO_init (fp, flags)
INTDEF(_IO_init) INTDEF(_IO_init)
void void
_IO_no_init (fp, flags, orientation, wd, jmp) _IO_old_init (fp, flags)
_IO_FILE *fp; _IO_FILE *fp;
int flags; int flags;
int orientation;
struct _IO_wide_data *wd;
struct _IO_jump_t *jmp;
{ {
fp->_flags = _IO_MAGIC|flags; fp->_flags = _IO_MAGIC|flags;
fp->_flags2 = 0; fp->_flags2 = 0;
@ -633,6 +630,17 @@ _IO_no_init (fp, flags, orientation, wd, jmp)
if (fp->_lock != NULL) if (fp->_lock != NULL)
_IO_lock_init (*fp->_lock); _IO_lock_init (*fp->_lock);
#endif #endif
}
void
_IO_no_init (fp, flags, orientation, wd, jmp)
_IO_FILE *fp;
int flags;
int orientation;
struct _IO_wide_data *wd;
struct _IO_jump_t *jmp;
{
_IO_old_init (fp, flags);
fp->_mode = orientation; fp->_mode = orientation;
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
if (orientation >= 0) if (orientation >= 0)

1
libio/libioP.h
View File

@ -479,6 +479,7 @@ extern int _IO_new_fgetpos64 __P ((_IO_FILE *, _IO_fpos64_t *));
extern int _IO_old_fgetpos64 __P ((_IO_FILE *, _IO_fpos64_t *)); extern int _IO_old_fgetpos64 __P ((_IO_FILE *, _IO_fpos64_t *));
extern int _IO_new_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); extern int _IO_new_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *));
extern int _IO_old_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); extern int _IO_old_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *));
extern void _IO_old_init __P ((_IO_FILE *fp, int flags));
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T

4
libio/oldiofdopen.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993,94,97,99,2000,2002 Free Software Foundation, Inc. /* Copyright (C) 1993,94,97,99,2000,2002,2003 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
@ -114,7 +114,7 @@ _IO_old_fdopen (fd, mode)
#ifdef _IO_MTSAFE_IO #ifdef _IO_MTSAFE_IO
new_f->fp.file._lock = &new_f->lock; new_f->fp.file._lock = &new_f->lock;
#endif #endif
INTUSE(_IO_init) (&new_f->fp.file, 0); _IO_old_init (&new_f->fp.file, 0);
_IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps; _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps;
_IO_old_file_init (&new_f->fp); _IO_old_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES #if !_IO_UNIFIED_JUMPTABLES

4
libio/oldiofopen.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. /* Copyright (C) 1993,1997,1999,2000,2002,2003 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
@ -53,7 +53,7 @@ _IO_old_fopen (filename, mode)
#ifdef _IO_MTSAFE_IO #ifdef _IO_MTSAFE_IO
new_f->fp.file._lock = &new_f->lock; new_f->fp.file._lock = &new_f->lock;
#endif #endif
INTUSE(_IO_init) (&new_f->fp.file, 0); _IO_old_init (&new_f->fp.file, 0);
_IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps; _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps;
_IO_old_file_init (&new_f->fp); _IO_old_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES #if !_IO_UNIFIED_JUMPTABLES

1
localedata/ChangeLog
View File

@ -1,6 +1,7 @@
2003-05-06 Ulrich Drepper <drepper@redhat.com> 2003-05-06 Ulrich Drepper <drepper@redhat.com>
* locales/de_DE: Use two-letter abday values. * locales/de_DE: Use two-letter abday values.
* tst-langinfo.sh: Update after de_DE locale change.
2003-05-05 Jakub Jelinek <jakub@redhat.com> 2003-05-05 Jakub Jelinek <jakub@redhat.com>

30
localedata/tst-langinfo.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Test nl_langinfo. # Test nl_langinfo.
# Copyright (C) 2000, 2001 Free Software Foundation, Inc. # Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.
# #
@ -155,13 +155,13 @@ en_US.ISO-8859-1 RADIXCHAR .
en_US.ISO-8859-1 THOUSEP , en_US.ISO-8859-1 THOUSEP ,
en_US.ISO-8859-1 YESEXPR ^[yY].* en_US.ISO-8859-1 YESEXPR ^[yY].*
en_US.ISO-8859-1 NOEXPR ^[nN].* en_US.ISO-8859-1 NOEXPR ^[nN].*
de_DE.ISO-8859-1 ABDAY_1 Son de_DE.ISO-8859-1 ABDAY_1 So
de_DE.ISO-8859-1 ABDAY_2 Mon de_DE.ISO-8859-1 ABDAY_2 Mo
de_DE.ISO-8859-1 ABDAY_3 Die de_DE.ISO-8859-1 ABDAY_3 Di
de_DE.ISO-8859-1 ABDAY_4 Mit de_DE.ISO-8859-1 ABDAY_4 Mi
de_DE.ISO-8859-1 ABDAY_5 Don de_DE.ISO-8859-1 ABDAY_5 Do
de_DE.ISO-8859-1 ABDAY_6 Fre de_DE.ISO-8859-1 ABDAY_6 Fr
de_DE.ISO-8859-1 ABDAY_7 Sam de_DE.ISO-8859-1 ABDAY_7 Sa
de_DE.ISO-8859-1 DAY_1 Sonntag de_DE.ISO-8859-1 DAY_1 Sonntag
de_DE.ISO-8859-1 DAY_2 Montag de_DE.ISO-8859-1 DAY_2 Montag
de_DE.ISO-8859-1 DAY_3 Dienstag de_DE.ISO-8859-1 DAY_3 Dienstag
@ -200,13 +200,13 @@ de_DE.ISO-8859-1 RADIXCHAR ,
de_DE.ISO-8859-1 THOUSEP . de_DE.ISO-8859-1 THOUSEP .
de_DE.ISO-8859-1 YESEXPR ^[jJyY].* de_DE.ISO-8859-1 YESEXPR ^[jJyY].*
de_DE.ISO-8859-1 NOEXPR ^[nN].* de_DE.ISO-8859-1 NOEXPR ^[nN].*
de_DE.UTF-8 ABDAY_1 Son de_DE.UTF-8 ABDAY_1 So
de_DE.UTF-8 ABDAY_2 Mon de_DE.UTF-8 ABDAY_2 Mo
de_DE.UTF-8 ABDAY_3 Die de_DE.UTF-8 ABDAY_3 Di
de_DE.UTF-8 ABDAY_4 Mit de_DE.UTF-8 ABDAY_4 Mi
de_DE.UTF-8 ABDAY_5 Don de_DE.UTF-8 ABDAY_5 Do
de_DE.UTF-8 ABDAY_6 Fre de_DE.UTF-8 ABDAY_6 Fr
de_DE.UTF-8 ABDAY_7 Sam de_DE.UTF-8 ABDAY_7 Sa
de_DE.UTF-8 DAY_1 Sonntag de_DE.UTF-8 DAY_1 Sonntag
de_DE.UTF-8 DAY_2 Montag de_DE.UTF-8 DAY_2 Montag
de_DE.UTF-8 DAY_3 Dienstag de_DE.UTF-8 DAY_3 Dienstag