mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 02:33:36 +08:00
Update.
2001-07-17 Ulrich Drepper <drepper@redhat.com> * elf/ldconfig.c (parse_conf): Disable implicit locking for the stream. Remove some unnecessary initializers.
This commit is contained in:
parent
0cfbb8c6ed
commit
c96873d780
@ -1,3 +1,8 @@
|
|||||||
|
2001-07-17 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* elf/ldconfig.c (parse_conf): Disable implicit locking for the
|
||||||
|
stream. Remove some unnecessary initializers.
|
||||||
|
|
||||||
2001-07-17 Andreas Jaeger <aj@suse.de>
|
2001-07-17 Andreas Jaeger <aj@suse.de>
|
||||||
|
|
||||||
* elf/ldconfig.c: Add new variable hwcap_mask to honour LD_HWCAP_MASK.
|
* elf/ldconfig.c: Add new variable hwcap_mask to honour LD_HWCAP_MASK.
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <libintl.h>
|
#include <libintl.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdio_ext.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -77,10 +78,10 @@ static struct dir_entry *dir_entries;
|
|||||||
|
|
||||||
/* Flags for different options. */
|
/* Flags for different options. */
|
||||||
/* Print Cache. */
|
/* Print Cache. */
|
||||||
static int opt_print_cache = 0;
|
static int opt_print_cache;
|
||||||
|
|
||||||
/* Be verbose. */
|
/* Be verbose. */
|
||||||
int opt_verbose = 0;
|
int opt_verbose;
|
||||||
|
|
||||||
/* Format to support. */
|
/* Format to support. */
|
||||||
/* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2. */
|
/* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2. */
|
||||||
@ -93,13 +94,13 @@ static int opt_build_cache = 1;
|
|||||||
static int opt_link = 1;
|
static int opt_link = 1;
|
||||||
|
|
||||||
/* Only process directories specified on the command line. */
|
/* Only process directories specified on the command line. */
|
||||||
static int opt_only_cline = 0;
|
static int opt_only_cline;
|
||||||
|
|
||||||
/* Path to root for chroot. */
|
/* Path to root for chroot. */
|
||||||
static char *opt_chroot;
|
static char *opt_chroot;
|
||||||
|
|
||||||
/* Manually link given shared libraries. */
|
/* Manually link given shared libraries. */
|
||||||
static int opt_manual_link = 0;
|
static int opt_manual_link;
|
||||||
|
|
||||||
/* Cache file to use. */
|
/* Cache file to use. */
|
||||||
static char *cache_file;
|
static char *cache_file;
|
||||||
@ -908,6 +909,9 @@ parse_conf (const char *filename)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* No threads use this stream. */
|
||||||
|
__fsetlocking (file, FSETLOCKING_BYCALLER);
|
||||||
|
|
||||||
if (canon != filename)
|
if (canon != filename)
|
||||||
free ((char *) canon);
|
free ((char *) canon);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user