From c96873d7803b50fa83d9a4f15160a86d6eef8275 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 17 Jul 2001 21:56:59 +0000 Subject: Update. 2001-07-17 Ulrich Drepper * elf/ldconfig.c (parse_conf): Disable implicit locking for the stream. Remove some unnecessary initializers. --- elf/ldconfig.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'elf') diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 5147b22..e1c3f84 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -77,10 +78,10 @@ static struct dir_entry *dir_entries; /* Flags for different options. */ /* Print Cache. */ -static int opt_print_cache = 0; +static int opt_print_cache; /* Be verbose. */ -int opt_verbose = 0; +int opt_verbose; /* Format to support. */ /* 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; /* Only process directories specified on the command line. */ -static int opt_only_cline = 0; +static int opt_only_cline; /* Path to root for chroot. */ static char *opt_chroot; /* Manually link given shared libraries. */ -static int opt_manual_link = 0; +static int opt_manual_link; /* Cache file to use. */ static char *cache_file; @@ -908,6 +909,9 @@ parse_conf (const char *filename) return; } + /* No threads use this stream. */ + __fsetlocking (file, FSETLOCKING_BYCALLER); + if (canon != filename) free ((char *) canon); -- cgit v1.1