Fix processing repeat counts in packinnext.

* src/binlog.c (vmod_start): call packinit.
* src/pack.c (packinst) <cur>: New member.
(packinnext): Correctly process repeat counts.
(packout): Likewise.
(packinit): New function.
* src/pack.h (packinit): New proto.

1 files changed, 19 insertions, 5 deletions

diff --git a/src/pack.c b/src/pack.c
index 12dc19d..2e7e7a6 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -69,6 +69,7 @@ struct packinst {
 	struct packinst *next;
 	struct packspec *spec;
 	int rep;
+	int cur;
 };
 
 static char *
@@ -509,10 +510,12 @@ packinnext(struct packinst *pi, struct packenv *env)
 		return NULL;
 	if (pi->spec->flags & F_REP)
 		pi->spec->packer(env, pi->spec, pi->rep);
-	else
-		for (i = 0; i < pi->rep; i++)
-			pi->spec->packer(env, pi->spec, 1);
-	return pi->next;
+	else {
+		pi->spec->packer(env, pi->spec, 1);
+		if (++pi->cur < pi->rep)
+			return pi;
+	}
+	return packinit(pi->next);
 }
 
 void
@@ -524,8 +527,11 @@ packout(struct packinst *pi, struct packenv *env)
 		if (pi->spec->flags & F_REP)
 			pi->spec->unpacker(env, pi->spec, pi->rep);
 		else
-			for (i = 0; i < pi->rep; i++)
+			for (i = 0; i < pi->rep; i++) {
+				if (i > 0)
+					fputc(' ', env->fp);
 				pi->spec->unpacker(env, pi->spec, 1);
+			}
 		if (pi->next)
 			fputc(' ', env->fp);
 	}
@@ -541,6 +547,14 @@ packsize(struct packinst *pi)
 	return env.buf_pos;
 }
 
+struct packinst *
+packinit(struct packinst *inst)
+{
+	if (inst)
+		inst->cur = 0;
+	return inst;
+}
+
 struct packenv *
 packenv_create(size_t size)
 {