diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-11-20 20:23:45 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-11-20 20:23:45 +0000 |
| commit | 250ecb48d516b08be7d0fdba0a7ba5146e148a77 (patch) | |
| tree | a9c28d14a760652bc6a5cc2081c7210856921ab2 | |
| parent | d3a9cb0c26d61f84586d37a29c4881614b612a69 (diff) | |
| download | glibc-250ecb48d516b08be7d0fdba0a7ba5146e148a77.tar.gz glibc-250ecb48d516b08be7d0fdba0a7ba5146e148a77.tar.xz glibc-250ecb48d516b08be7d0fdba0a7ba5146e148a77.zip | |
Update. cvs/fedora-glibc-20041121T1116
* time/tzfile.c (__tzfile_read): Avoid open for checking whether the file we already use changed.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | time/tzfile.c | 23 |
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 95017eadd1..e250e347b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-11-20 Ulrich Drepper <drepper@redhat.com> + * time/tzfile.c (__tzfile_read): Avoid open for checking whether + the file we already use changed. + * misc/syslog.c: Remove !USE_IN_LIBIO code. 2004-11-20 Jakub Jelinek <jakub@redhat.com> diff --git a/time/tzfile.c b/time/tzfile.c index 48c1e4d790..e95fd55f36 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -149,27 +149,30 @@ __tzfile_read (const char *file, size_t extra, char **extrap) file = new; } + /* If we were already using tzfile, check whether the file changed. */ + struct stat64 st; + if (was_using_tzfile + && stat64 (file, &st) == 0 + && tzfile_ino == st.st_ino && tzfile_dev == st.st_dev + && tzfile_mtime == st.st_mtime) + { + /* Nothing to do. */ + __use_tzfile = 1; + return; + } + /* Note the file is opened with cancellation in the I/O functions disabled. */ f = fopen (file, "rc"); if (f == NULL) goto ret_free_transitions; - /* Get information about the file. */ - struct stat64 st; + /* Get information about the file we are actually using. */ if (fstat64 (fileno (f), &st) != 0) { fclose (f); goto ret_free_transitions; } - if (was_using_tzfile && tzfile_ino == st.st_ino && tzfile_dev == st.st_dev - && tzfile_mtime == st.st_mtime) - { - /* It's the same file. No further work needed. */ - fclose (f); - __use_tzfile = 1; - return; - } free ((void *) transitions); transitions = NULL; |