1 files changed, 60 insertions, 6 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index ec8b066..284a0a6 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -4665,7 +4665,6 @@ static void lib9p_fid_format(lib9p_fid_t *self, struct fmt_state *state) {
 }
 
 static void lib9p_s_format(struct lib9p_s *self, struct fmt_state *state) {
-	/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47781 */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
 #pragma GCC diagnostic ignored "-Wformat-extra-args"
@@ -5273,7 +5272,18 @@ static void lib9p_msg_Rread_format(struct lib9p_msg_Rread *self, struct fmt_stat
 	lib9p_tag_format(&self->tag, state);
 	fmt_state_puts(state, " count=");
 	fmt_state_printf(state, "%"PRIu32, self->count);
-	fmt_state_puts(state, " data=<bytedata>");
+	if (is_valid_utf8_without_nul((uint8_t *)self->data, (size_t)self->count)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+		fmt_state_printf(state, " data=%.*q%s",
+			(int)(self->count < 50 ? self->count : 50),
+			(char *)self->data,
+			self->count < 50 ? "" : "...");
+#pragma GCC diagnostic pop
+	} else {
+		fmt_state_puts(state, " data=<bytedata>");
+	}
 	fmt_state_puts(state, " }");
 }
 
@@ -5287,7 +5297,18 @@ static void lib9p_msg_Twrite_format(struct lib9p_msg_Twrite *self, struct fmt_st
 	fmt_state_printf(state, "%"PRIu64, self->offset);
 	fmt_state_puts(state, " count=");
 	fmt_state_printf(state, "%"PRIu32, self->count);
-	fmt_state_puts(state, " data=<bytedata>");
+	if (is_valid_utf8_without_nul((uint8_t *)self->data, (size_t)self->count)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+		fmt_state_printf(state, " data=%.*q%s",
+			(int)(self->count < 50 ? self->count : 50),
+			(char *)self->data,
+			self->count < 50 ? "" : "...");
+#pragma GCC diagnostic pop
+	} else {
+		fmt_state_puts(state, " data=<bytedata>");
+	}
 	fmt_state_puts(state, " }");
 }
 
@@ -7086,7 +7107,18 @@ static void lib9p_msg_Rreaddir_format(struct lib9p_msg_Rreaddir *self, struct fm
 	lib9p_tag_format(&self->tag, state);
 	fmt_state_puts(state, " count=");
 	fmt_state_printf(state, "%"PRIu32, self->count);
-	fmt_state_puts(state, " data=<bytedata>");
+	if (is_valid_utf8_without_nul((uint8_t *)self->data, (size_t)self->count)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+		fmt_state_printf(state, " data=%.*q%s",
+			(int)(self->count < 50 ? self->count : 50),
+			(char *)self->data,
+			self->count < 50 ? "" : "...");
+#pragma GCC diagnostic pop
+	} else {
+		fmt_state_puts(state, " data=<bytedata>");
+	}
 	fmt_state_puts(state, " }");
 }
 
@@ -7302,7 +7334,18 @@ static void lib9p_msg_Rsread_format(struct lib9p_msg_Rsread *self, struct fmt_st
 	lib9p_tag_format(&self->tag, state);
 	fmt_state_puts(state, " count=");
 	fmt_state_printf(state, "%"PRIu32, self->count);
-	fmt_state_puts(state, " data=<bytedata>");
+	if (is_valid_utf8_without_nul((uint8_t *)self->data, (size_t)self->count)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+		fmt_state_printf(state, " data=%.*q%s",
+			(int)(self->count < 50 ? self->count : 50),
+			(char *)self->data,
+			self->count < 50 ? "" : "...");
+#pragma GCC diagnostic pop
+	} else {
+		fmt_state_puts(state, " data=<bytedata>");
+	}
 	fmt_state_puts(state, " }");
 }
 
@@ -7323,7 +7366,18 @@ static void lib9p_msg_Tswrite_format(struct lib9p_msg_Tswrite *self, struct fmt_
 	fmt_state_puts(state, " ]");
 	fmt_state_puts(state, " count=");
 	fmt_state_printf(state, "%"PRIu32, self->count);
-	fmt_state_puts(state, " data=<bytedata>");
+	if (is_valid_utf8_without_nul((uint8_t *)self->data, (size_t)self->count)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+		fmt_state_printf(state, " data=%.*q%s",
+			(int)(self->count < 50 ? self->count : 50),
+			(char *)self->data,
+			self->count < 50 ? "" : "...");
+#pragma GCC diagnostic pop
+	} else {
+		fmt_state_puts(state, " data=<bytedata>");
+	}
 	fmt_state_puts(state, " }");
 }