dovecot-2.2: fs-metawrap: Fixed iteration wrapping, broken by ea...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d080dc2e1280
changeset: 17809:d080dc2e1280
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 16 12:04:07 2014 +0300
description:
fs-metawrap: Fixed iteration wrapping, broken by earlier changes.

diffstat:

 src/lib-fs/fs-metawrap.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r a49c4e0d351a -r d080dc2e1280 src/lib-fs/fs-metawrap.c
--- a/src/lib-fs/fs-metawrap.c	Tue Sep 16 01:12:21 2014 +0300
+++ b/src/lib-fs/fs-metawrap.c	Tue Sep 16 12:04:07 2014 +0300
@@ -425,8 +425,14 @@
 static const char *fs_metawrap_iter_next(struct fs_iter *_iter)
 {
 	struct metawrap_fs_iter *iter = (struct metawrap_fs_iter *)_iter;
+	const char *fname;
 
-	return fs_iter_next(iter->super);
+	iter->super->async_callback = _iter->async_callback;
+	iter->super->async_context = _iter->async_context;
+
+	fname = fs_iter_next(iter->super);
+	_iter->async_have_more = iter->super->async_have_more;
+	return fname;
 }
 
 static int fs_metawrap_iter_deinit(struct fs_iter *_iter)