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 /time | |
| parent | 58e8ec84f450f5f4eb00f4c445de9562bfa359e9 (diff) | |
| download | glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar.gz glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar.xz glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.zip | |
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 'time')
| -rw-r--r-- | time/getdate.c | 4 | ||||
| -rw-r--r-- | time/tzfile.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/time/getdate.c b/time/getdate.c index 8c9d16f833..851efacfd2 100644 --- a/time/getdate.c +++ b/time/getdate.c @@ -1,5 +1,5 @@ /* Convert a string representation of time to a time value. - Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -129,7 +129,7 @@ __getdate_r (const char *string, struct tm *tp) return 2; /* Open the template file. */ - fp = fopen (datemsk, "r"); + fp = fopen (datemsk, "rc"); if (fp == NULL) return 2; diff --git a/time/tzfile.c b/time/tzfile.c index 2d1775b05b..e2d9f50cd9 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -148,7 +148,9 @@ __tzfile_read (const char *file, size_t extra, char **extrap) file = new; } - f = fopen (file, "r"); + /* Note the file is opened with cancellation in the I/O functions + disabled. */ + f = fopen (file, "rc"); if (f == NULL) return; |