WIP

infradig · infradig · commit dbe3c30f817f · 2024-01-30T17:55:40.000+10:00
diff --git a/src/stringbuf.h b/src/stringbuf.h
@@ -48,11 +48,13 @@ typedef struct {
 }
 
 #define SB_strlen(pr) (pr##_buf.dst - pr##_buf.buf)
+#define SB_strlen_utf8(pr) strlen_utf8(pr##_buf.buf)
 
 #define SB_truncate(pr,len) {									\
-	if ((len) < SB_strlen(pr) {									\
-		pr##_buf.dst = pr##_buf.buf + (len);					\
-		*pr##_buf.dst = '\0';									\
+	const char *src = pr##_buf.buf;								\
+	for (unsigned i = 0; i < len; i++) {						\
+		int ch = get_char_utf8(&src);							\
+		if (!ch) break;											\
 	}															\
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,13 @@ typedef struct {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`#define SB_strlen(pr) (pr##_buf.dst - pr##_buf.buf)`
	`51`	`+#define SB_strlen_utf8(pr) strlen_utf8(pr##_buf.buf)`
`51`	`52`
`52`	`53`	`#define SB_truncate(pr,len) { \`
`53`		`- if ((len) < SB_strlen(pr) { \`
`54`		`- pr##_buf.dst = pr##_buf.buf + (len); \`
`55`		`- *pr##_buf.dst = '\0'; \`
	`54`	`+ const char *src = pr##_buf.buf; \`
	`55`	`+ for (unsigned i = 0; i < len; i++) { \`
	`56`	`+ int ch = get_char_utf8(&src); \`
	`57`	`+ if (!ch) break; \`
`56`	`58`	`} \`
`57`	`59`	`}`
`58`	`60`