X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/779cb9b02891e3f9fc8b9620bb630cf529d76c67..7031fb3bec5bbef1d14686ba0434442a4ebf5ebd:/src/output.c

diff --git a/src/output.c b/src/output.c
index 1075221..c0438e6 100644
--- a/src/output.c
+++ b/src/output.c
@@ -25,8 +25,6 @@
 #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)
 {
 	size_t x = MIN(amount, dst->dstlen);
@@ -38,11 +36,17 @@ size_t cdecl__advance(struct output_state *dst, size_t amount)
 	return amount;
 }
 
-static size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
+size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
 {
-	if (dst)
-		snprintf(dst, dstlen, "%s", src);
-	return strlen(src);
+	size_t srclen = strlen(src);
+
+	if (dstlen > 0) {
+		memcpy(dst, src, MIN(dstlen, srclen+1));
+		if (dstlen <= srclen)
+			dst[dstlen-1] = 0;
+	}
+
+	return srclen;
 }
 
 size_t cdecl__emit(struct output_state *dst, const char *src)
@@ -51,6 +55,41 @@ size_t cdecl__emit(struct output_state *dst, const char *src)
 	return cdecl__advance(dst, rc);
 }
 
+/*
+ * 31 decimal digits is enough for values up to 2^102 - 1.
+ * 63 decimal digits is enough for values up to 2^209 - 1.
+ *
+ * We can't portably write numbers this large in preprocessor conditionals,
+ * but since the maximum values of unsigned integer types are always one
+ * less than a power of two, we can use a sequence of small shifts to infer
+ * the bounds.
+ *
+ * All known implementations have 64-bit uintmax_t.  Leave some headroom
+ * to support a possible future implementatons with 128-bit uintmax_t.
+ */
+enum {
+#if (UINTMAX_MAX >> 27 >> 27 >> 26 >> 26) == 0
+	MAX_UINT_DIGITS = 31
+#elif (UINTMAX_MAX >> 27 >> 26 >> 26 >> 26 >> 26 >> 26 >> 26 >> 26) == 0
+	MAX_UINT_DIGITS = 63
+#else
+#	error UINTMAX_MAX is too large, please report a bug.
+#endif
+};
+
+size_t cdecl__emit_uint(struct output_state *dst, uintmax_t val)
+{
+	char buf[MAX_UINT_DIGITS + 1], *p = &buf[sizeof buf];
+
+	*(--p) = 0;
+	while (val > 0) {
+		*(--p) = '0' + val % 10;
+		val /= 10;
+	}
+
+	return cdecl__emit(dst, p);
+}
+
 static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
 	size_t rc;