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

diff --git a/src/output.c b/src/output.c
index 27921ab..7206eb9 100644
--- a/src/output.c
+++ b/src/output.c
@@ -22,38 +22,44 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
+#include "parse.h"
 #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;
 }
 
+size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
+{
+	if (dst)
+		snprintf(dst, dstlen, "%s", src);
+	return strlen(src);
+}
+
 size_t cdecl__emit(struct output_state *dst, const char *src)
 {
-	size_t rc = snprintf(dst->dst, dst->dstlen, "%s", src);
+	size_t rc = cdecl__strlcpy(dst->dst, src, dst->dstlen);
 	return cdecl__advance(dst, rc);
 }
 
-static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
+static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
-	size_t ret;
+	size_t rc;
 
-	ret = cdecl__emit(dst, spec_string(s->type));
+	rc = cdecl__emit(dst, spec_string(s->type));
 	if (s->ident) {
-		ret += cdecl__emit(dst, " " + !ret);
-		ret += cdecl__emit(dst, s->ident);
+		cdecl__emit(dst, " " + !rc);
+		cdecl__emit(dst, s->ident);
 	}
-
-	return ret;
 }
 
 /*
@@ -61,19 +67,21 @@ static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__emit_specs(struct output_state *dst,
-                         struct cdecl_declspec *s,
-                         unsigned mask)
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask)
 {
-	size_t ret = 0;
+	const char *sep = " ";
+	int empty = 1;
 
 	for (; s; s = s->next) {
 		if (!(s->type & mask))
 			continue;
 
-		ret += cdecl__emit(dst, " " + !ret);
-		ret += explain_spec(dst, s);
+		cdecl__emit(dst, sep + empty);
+		explain_spec(dst, s);
+		empty = 0;
 	}
 
-	return ret;
+	return sep + empty;
 }