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 /resolv | |
parent | 58e8ec84f450f5f4eb00f4c445de9562bfa359e9 (diff) | |
download | glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.zip glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar.gz glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar.bz2 |
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 'resolv')
-rw-r--r-- | resolv/res_hconf.c | 4 | ||||
-rw-r--r-- | resolv/res_init.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index 40afeb0..cd622ed 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). @@ -425,7 +425,7 @@ do_init (void) if (hconf_name == NULL) hconf_name = _PATH_HOSTCONF; - fp = fopen (hconf_name, "r"); + fp = fopen (hconf_name, "rc"); if (!fp) /* make up something reasonable: */ _res_hconf.service[_res_hconf.num_services++] = SERVICE_BIND; diff --git a/resolv/res_init.c b/resolv/res_init.c index 7b9cf43..61820e6 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -231,7 +231,7 @@ __res_vinit(res_state statp, int preinit) { (line[sizeof(name) - 1] == ' ' || \ line[sizeof(name) - 1] == '\t')) - if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) { + if ((fp = fopen(_PATH_RESCONF, "rc")) != NULL) { /* No threads use this stream. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); /* read the config file */ |