X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/72aedaedd7afa666f7c69dfe7ef4b7ec3dbc2458..db974c0a690f2044dcbc06446333837c3c3e1cec:/src/output.c

diff --git a/src/output.c b/src/output.c
index fb80f99..634b79e 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /*
  *  Helper functions for outputting text.
- *  Copyright © 2011, 2021, 2023 Nick Bowler
+ *  Copyright © 2011, 2021, 2023-2024 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  */
 #include <config.h>
 #include <stdio.h>
+#include <limits.h>
 #include <assert.h>
 
 #include "cdecl.h"
@@ -38,9 +39,15 @@ size_t cdecl__advance(struct output_state *dst, size_t 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 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)
@@ -49,29 +56,15 @@ 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
+	/*
+	 * upper bound on number of decimal digits required to convert
+	 * cdecl_uintmax.
+	 */
+	MAX_UINT_DIGITS = (CHAR_BIT * sizeof (cdecl_uintmax) + 2)/3
 };
 
-size_t cdecl__emit_uint(struct output_state *dst, uintmax_t val)
+size_t cdecl__emit_uint(struct output_state *dst, cdecl_uintmax val)
 {
 	char buf[MAX_UINT_DIGITS + 1], *p = &buf[sizeof buf];