diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-07-17 21:56:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-07-17 21:56:59 +0000 |
| commit | c96873d7803b50fa83d9a4f15160a86d6eef8275 (patch) | |
| tree | e7e08f406d099021d628a27e565b9c0def670d2b | |
| parent | 0cfbb8c6ed421830ba951ad2ff7fea26167eb561 (diff) | |
| download | glibc-c96873d7803b50fa83d9a4f15160a86d6eef8275.tar.gz glibc-c96873d7803b50fa83d9a4f15160a86d6eef8275.tar.xz glibc-c96873d7803b50fa83d9a4f15160a86d6eef8275.zip | |
Update.
2001-07-17 Ulrich Drepper <drepper@redhat.com> * elf/ldconfig.c (parse_conf): Disable implicit locking for the stream. Remove some unnecessary initializers.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/ldconfig.c | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 83252126ee..935560579d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> * elf/ldconfig.c: Add new variable hwcap_mask to honour LD_HWCAP_MASK. diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 5147b22fcc..e1c3f84054 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -26,6 +26,7 @@ #include <inttypes.h> #include <libintl.h> #include <stdio.h> +#include <stdio_ext.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -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); |