lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

Update.

Browse Source 
2003-08-26  Jakub Jelinek  <jakub@redhat.com>

	* elf/ldconfig.c (search_dir): When checking for GNU-style .so
	link file use the real file name, not the resolved name we got by
	following the symlinks.
This commit is contained in:
Ulrich Drepper
2003-08-26 08:08:21 +00:00
parent 41c26b683e
commit 2fe98a4ae7
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2003-08-26 Jakub Jelinek <jakub@redhat.com>
* elf/ldconfig.c (search_dir): When checking for GNU-style .so
link file use the real file name, not the resolved name we got by
following the symlinks.
2003-08-25 Ulrich Drepper <drepper@redhat.com> 2003-08-25 Ulrich Drepper <drepper@redhat.com>
* libio/oldfileops.c (_IO_old_file_init): Initialize _mode field * libio/oldfileops.c (_IO_old_file_init): Initialize _mode field

2
elf/ldconfig.c
View File

@@ -793,7 +793,7 @@ search_dir (const struct dir_entry *entry)
{ {
/* If the path the link points to isn't its soname and it is not /* If the path the link points to isn't its soname and it is not
.so symlink for ld(1) only, we treat it as a normal file. */ .so symlink for ld(1) only, we treat it as a normal file. */
char *real_base_name = basename (real_name); const char *real_base_name = basename (real_file_name);
if (strcmp (real_base_name, soname) != 0) if (strcmp (real_base_name, soname) != 0)
{ {

11
libio/oldfileops.c
View File

@@ -129,13 +129,14 @@ _IO_old_file_init (fp)
- (int) sizeof (struct _IO_FILE_complete)); - (int) sizeof (struct _IO_FILE_complete));
fp->file._fileno = -1; fp->file._fileno = -1;
#if defined SHARED && defined _LIBC \ #if defined SHARED && defined _LIBC
&& SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) if (__builtin_expect (&_IO_stdin_used != NULL, 1)
if (__builtin_expect (&_IO_stdin_used != NULL, 0) || (fp != (struct _IO_FILE_plus *) _IO_stdin
|| (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)) && fp != (struct _IO_FILE_plus *) _IO_stdout
&& fp != (struct _IO_FILE_plus *) _IO_stderr))
/* The object is dynamically allocated and large enough. Initialize /* The object is dynamically allocated and large enough. Initialize
the _mode element as well. */ the _mode element as well. */
fp->_mode = -1; ((struct _IO_FILE_complete *) fp)->_mode = -1;
#endif #endif
} }