X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/0b2a2978f09f5d9b56d8655dd60eaffbe9006b7a..225fb0d496bd8f9fcbc2f800819a83c71d763a61:/src/output.c

diff --git a/src/output.c b/src/output.c
index 27921ab..b33816a 100644
--- a/src/output.c
+++ b/src/output.c
@@ -24,15 +24,15 @@
 
 #include "specstr.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-	if (amount >= dst->dstlen) {
-		dst->dstlen = 0;
-		dst->dst    = 0;
-	} else {
-		dst->dst    += amount;
-		dst->dstlen -= amount;
-	}
+	size_t x = MIN(amount, dst->dstlen);
+
+	dst->dst    += x;
+	dst->dstlen -= x;
+	dst->accum  += amount;
 
 	return amount;
 }