diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-12-16 17:50:48 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-12-16 17:50:48 +0000 |
commit | 3d73829c187f7d34c5c3c44047da1137adf36d86 (patch) | |
tree | 0f4757a60e32527b36721436d93af71013422081 /io/ftw.c | |
parent | 887e7ab6c5a13398e5986c7054235a135e6429f9 (diff) | |
download | glibc-3d73829c187f7d34c5c3c44047da1137adf36d86.tar.gz glibc-3d73829c187f7d34c5c3c44047da1137adf36d86.tar.xz glibc-3d73829c187f7d34c5c3c44047da1137adf36d86.zip |
Update.
2000-12-16 Ulrich Drepper <drepper@redhat.com> * timezone/asia: Update from tzdata2000h. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. 2000-12-14 Jakub Jelinek <jakub@redhat.com> * io/ftw.c (ftw_dir): If process_entry returned non-zero result and dir.stream is NULL, only free dir.content. * io/ftwtest.c (cb, main): Add --early-exit option to test it. * io/ftwtest-sh: Test with --early-exit.
Diffstat (limited to 'io/ftw.c')
-rw-r--r-- | io/ftw.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/io/ftw.c b/io/ftw.c index e832fbbc99..01abb63782 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -426,15 +426,11 @@ ftw_dir (struct ftw_data *data, struct STAT *st) int save_err; char *runp = dir.content; - assert (result == 0); - - while (*runp != '\0') + while (result == 0 && *runp != '\0') { char *endp = strchr (runp, '\0'); result = process_entry (data, &dir, runp, endp - runp); - if (result != 0) - break; runp = endp + 1; } |