diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-07-17 08:32:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-07-17 08:32:35 +0000 |
| commit | 2706ee382341eb1c2e5f96c7d90f346696dbd0d8 (patch) | |
| tree | c29690519bcb43604d9e0affa936aa7a2798660a /iconv | |
| parent | 23700036397721389b90ac41571d68df2f26ad67 (diff) | |
| download | glibc-2706ee382341eb1c2e5f96c7d90f346696dbd0d8.zip glibc-2706ee382341eb1c2e5f96c7d90f346696dbd0d8.tar.gz glibc-2706ee382341eb1c2e5f96c7d90f346696dbd0d8.tar.bz2 | |
Update.
2001-07-17 Ulrich Drepper <drepper@redhat.com>
* inet/rcmd.c (iruserfopen): Disable implicit locking for the stream.
* inet/ruserpass.c (ruserpass): Likewise.
* nss/nsswitch.c (nss_parse_file): Likewise.
* resolv/res_hconf.c (_res_hconf_init): Likewise.
* resolv/res_init.c (__res_vinit): Likewise.
* gmon/bb_exit_func.c (__bb_exit_func): Likewise.
* misc/getpass.c (getpass): Likewise.
* misc/getusershell.c (initshells): Likewise.
* misc/getttyent.c (setttyent): Likewise.
* misc/mntent_r.c (__setmntent): Likewise.
* time/getdate.c (__getdate_r): Likewise.
* time/tzfile.c (__tzfile_read): Likewise.
* iconv/gconv_conf.c (read_conf_file): Likewise.
* intl/localealias.c (read_alias_file): Disable implicit locking
for the stream. Use _unlocked functions for glibc.
* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Disable
implicit locking for the stream.
(__get_nprocs_conf): Likewise.
(phys_pages_info): Likewise.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_conf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 3e3fd98..9cedbb8 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -25,6 +25,7 @@ #include <search.h> #include <stddef.h> #include <stdio.h> +#include <stdio_ext.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -358,6 +359,9 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len, if (fp == NULL) return; + /* No threads reading from this stream. */ + __fsetlocking (fp, FSETLOCKING_BYCALLER); + /* Process the known entries of the file. Comments start with `#' and end with the end of the line. Empty lines are ignored. */ while (!feof_unlocked (fp)) |