diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-04 08:27:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-04 08:27:37 +0000 |
| commit | ee8449f7293a20a2a971ecdbf3d31129a281dee4 (patch) | |
| tree | f25aa0962ffe3adf5afc014d61a9db0f8153c5c3 /iconv | |
| parent | 58e8ec84f450f5f4eb00f4c445de9562bfa359e9 (diff) | |
Update.
2003-09-04 Ulrich Drepper <drepper@redhat.com>
* libio/libio.h: Define _IO_FLAGS2_NOTCANCEL.
* libio/fileops.c [_LIBC]: Remove close macro.
(_IO_file_open): If _IO_FLAGS2_NOTCANCEL is set, use open_not_cancel.
(_IO_new_file_open): Recognize 'c' flag in mode string.
(_IO_file_read): If _IO_FLAGS2_NOTCANCEL is set use read_not_cancel.
(_IO_new_file_write): If _IO_FLAGS2_NOTCANCEL is set use
write_not_cancel.
* iconv/gconv_conf.c: Use fopen with 'c' mode flag.
* inet/rcmd.c: Likewise.
* inet/ruserpass.c: Likewise.
* intl/localealias.c: Likewise.
* malloc/mtrace.c: Likewise.
* misc/getpass.c: Likewise.
* misc/getttyent.c: Likewise.
* misc/mntent_r.c: Likewise.
* misc/getusershell.c: Likewise.
* nss/nsswitch.c: Likewise.
* resolv/res_hconf.c: Likewise.
* resolv/res_init.c: Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c: Likewise.
* time/getdate.c: Likewise.
* time/tzfile.c: Likewise.
* misc/fstab.h: Undo last change.
* misc/mntent.h: Likewise.
* misc/Makefile: Remove CFLAGS-mntent_r.c, CFLAGS-mntent.c, and
CFLAGS-fstab.c definition.
2003-09-04 Jakub Jelinek <jakub@redhat.com>
2003-09-03 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_conf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 1fa7d0e9f8..858d40998b 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -357,7 +357,9 @@ internal_function read_conf_file (const char *filename, const char *directory, size_t dir_len, void **modules, size_t *nmodules) { - FILE *fp = fopen (filename, "r"); + /* Note the file is opened with cancellation in the I/O functions + disabled. */ + FILE *fp = fopen (filename, "rc"); char *line = NULL; size_t line_len = 0; static int modcounter; |