Merge branch 'lukeshu/9p-tests'

1 files changed, 75 insertions, 21 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index b58a485..284a0a6 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -2019,11 +2019,11 @@ static void unmarshal_Rerror([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *net
 	net_offset += 4;
 	net_offset += 1;
 	UNMARSHAL_U16LE(ctx, out->tag);
-	UNMARSHAL_U16LE(ctx, out->ename.len);
-	UNMARSHAL_BYTES(ctx, out->ename.utf8, out->ename.len);
+	UNMARSHAL_U16LE(ctx, out->errstr.len);
+	UNMARSHAL_BYTES(ctx, out->errstr.utf8, out->errstr.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		UNMARSHAL_U32LE(ctx, out->errno);
+		UNMARSHAL_U32LE(ctx, out->errnum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
@@ -2353,7 +2353,7 @@ static void unmarshal_Rlerror([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *ne
 	net_offset += 4;
 	net_offset += 1;
 	UNMARSHAL_U16LE(ctx, out->tag);
-	UNMARSHAL_U32LE(ctx, out->ecode);
+	UNMARSHAL_U32LE(ctx, out->errnum);
 }
 
 static void unmarshal_Tstatfs([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out_buf) {
@@ -3154,7 +3154,7 @@ static bool marshal_Rattach(struct lib9p_ctx *ctx, struct lib9p_msg_Rattach *val
 }
 
 static bool marshal_Rerror(struct lib9p_ctx *ctx, struct lib9p_msg_Rerror *val, struct _marshal_ret *ret) {
-	uint32_t needed_size = 9 + val->ename.len;
+	uint32_t needed_size = 9 + val->errstr.len;
 #if CONFIG_9P_ENABLE_9P2000_u
 	if is_ver(ctx, 9P2000_u) {
 		needed_size += 4;
@@ -3172,11 +3172,11 @@ static bool marshal_Rerror(struct lib9p_ctx *ctx, struct lib9p_msg_Rerror *val,
 	MARSHAL_U32LE(ctx, offsetof_end - offsetof_size);
 	MARSHAL_U8LE(ctx, 107);
 	MARSHAL_U16LE(ctx, val->tag);
-	MARSHAL_U16LE(ctx, val->ename.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->ename.utf8, val->ename.len);
+	MARSHAL_U16LE(ctx, val->errstr.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->errstr.utf8, val->errstr.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		MARSHAL_U32LE(ctx, val->errno);
+		MARSHAL_U32LE(ctx, val->errnum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	return false;
@@ -3715,7 +3715,7 @@ static bool marshal_Rlerror(struct lib9p_ctx *ctx, struct lib9p_msg_Rlerror *val
 	MARSHAL_U32LE(ctx, offsetof_end - offsetof_size);
 	MARSHAL_U8LE(ctx, 7);
 	MARSHAL_U16LE(ctx, val->tag);
-	MARSHAL_U32LE(ctx, val->ecode);
+	MARSHAL_U32LE(ctx, val->errnum);
 	return false;
 }
 
@@ -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"
@@ -5141,11 +5140,11 @@ static void lib9p_msg_Rerror_format(struct lib9p_msg_Rerror *self, struct fmt_st
 	fmt_state_puts(state, "Rerror {");
 	fmt_state_puts(state, " tag=");
 	lib9p_tag_format(&self->tag, state);
-	fmt_state_puts(state, " ename=");
-	lib9p_s_format(&self->ename, state);
+	fmt_state_puts(state, " errstr=");
+	lib9p_s_format(&self->errstr, state);
 #if CONFIG_9P_ENABLE_9P2000_u
-	fmt_state_puts(state, " errno=");
-	lib9p_errno_format(&self->errno, state);
+	fmt_state_puts(state, " errnum=");
+	lib9p_errno_format(&self->errnum, state);
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	fmt_state_puts(state, " }");
 }
@@ -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, " }");
 }
 
@@ -6752,8 +6773,8 @@ static void lib9p_msg_Rlerror_format(struct lib9p_msg_Rlerror *self, struct fmt_
 	fmt_state_puts(state, "Rlerror {");
 	fmt_state_puts(state, " tag=");
 	lib9p_tag_format(&self->tag, state);
-	fmt_state_puts(state, " ecode=");
-	lib9p_errno_format(&self->ecode, state);
+	fmt_state_puts(state, " errnum=");
+	lib9p_errno_format(&self->errnum, state);
 	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, " }");
 }