diff options
| author | Roland McGrath <roland@gnu.org> | 2004-12-01 19:55:58 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-12-01 19:55:58 +0000 |
| commit | 469dcb0d463740a3c15ef231ea110bf01bafbaa3 (patch) | |
| tree | b444375d446c96f570112f6d94548830f722062a | |
| parent | c13bc9621fabbfd687adbefab5f9c5ba13d8b14c (diff) | |
| download | glibc-469dcb0d463740a3c15ef231ea110bf01bafbaa3.tar.gz glibc-469dcb0d463740a3c15ef231ea110bf01bafbaa3.tar.xz glibc-469dcb0d463740a3c15ef231ea110bf01bafbaa3.zip | |
* posix/fnmatch_loop.c (internal_fnmatch): Clear is_seqval after
normal_bracket label. * time/tst-mktime2.c (bigtime_test): Initialize tm.tm_isdst to -1.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | posix/fnmatch_loop.c | 3 | ||||
| -rw-r--r-- | time/tst-mktime2.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c46fcc0a6a..f0434213bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ * stdlib/stdlib.h (realpath): Remove nonnull attribute. + * posix/fnmatch_loop.c (internal_fnmatch): Clear is_seqval after + normal_bracket label. + + * time/tst-mktime2.c (bigtime_test): Initialize tm.tm_isdst to -1. + 2004-12-01 Roland McGrath <roland@redhat.com> * sysdeps/gnu/Makefile ($(objpfx)errlist-compat.c): diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c index fb56bd426b..449e5e02b4 100644 --- a/posix/fnmatch_loop.c +++ b/posix/fnmatch_loop.c @@ -600,6 +600,9 @@ FCT (pattern, string, string_end, no_leading_period, flags) if (!is_range && c == fn) goto matched; + /* This is needed if we goto normal_bracket; from + outside of is_seqval's scope. */ + is_seqval = 0; cold = c; c = *p++; } diff --git a/time/tst-mktime2.c b/time/tst-mktime2.c index fe7c370928..6279218cba 100644 --- a/time/tst-mktime2.c +++ b/time/tst-mktime2.c @@ -78,6 +78,7 @@ bigtime_test (int j) struct tm tm; time_t now; tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + tm.tm_isdst = -1; now = mktime (&tm); if (now != (time_t) -1) { |