Merge branch 'lukeshu/9p-tidy'

2 files changed, 79 insertions, 45 deletions

diff --git a/lib9p/core_include/lib9p/_core_generated.h b/lib9p/core_include/lib9p/_core_generated.h
index 68eb636..4c45b58 100644
--- a/lib9p/core_include/lib9p/_core_generated.h
+++ b/lib9p/core_include/lib9p/_core_generated.h
@@ -1,4 +1,4 @@
-/* Generated by `lib9p/core.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
+/* Generated by `lib9p/core.gen lib9p/idl/0000-uninitialized.9p lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
 
 #ifndef _LIB9P_CORE_H_
 	#error Do not include <lib9p/_core_generated.h> directly; include <lib9p/core.h> instead
@@ -40,6 +40,12 @@
 	#error config.h must define CONFIG_9P_ENABLE_9P2000_u
 #endif
 
+#ifndef CONFIG_9P_ENABLE_unknown
+	#error config.h must define CONFIG_9P_ENABLE_unknown
+#endif
+
+#define _LIB9P_ENABLE_stat CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+
 /* enum version ***************************************************************/
 
 enum lib9p_version {
@@ -111,17 +117,19 @@ enum lib9p_msg_type { /* uint8_t */
 	LIB9P_TYP_Topenfd      = 98,
 	LIB9P_TYP_Ropenfd      = 99,
 #endif /* CONFIG_9P_ENABLE_9P2000_p9p */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 	LIB9P_TYP_Tversion     = 100,
 	LIB9P_TYP_Rversion     = 101,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_TYP_Tauth        = 102,
 	LIB9P_TYP_Rauth        = 103,
 	LIB9P_TYP_Tattach      = 104,
 	LIB9P_TYP_Rattach      = 105,
 #endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 	LIB9P_TYP_Rerror       = 107,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_TYP_Tflush       = 108,
 	LIB9P_TYP_Rflush       = 109,
@@ -163,7 +171,7 @@ LO_IMPLEMENTATION_H(fmt_formatter, enum lib9p_msg_type, lib9p_msg_type);
 
 /* payload types **************************************************************/
 
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 /* size = 2 ; max_iov = 1 ; max_copy = 2 */
 typedef uint16_t lib9p_tag_t;
 LO_IMPLEMENTATION_H(fmt_formatter, lib9p_tag_t, lib9p_tag);
@@ -174,8 +182,8 @@ typedef uint32_t lib9p_fid_t;
 LO_IMPLEMENTATION_H(fmt_formatter, lib9p_fid_t, lib9p_fid);
 #define LIB9P_FID_NOFID ((lib9p_fid_t)(UINT32_MAX))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 /* size = 4 ; max_iov = 1 ; max_copy = 4 */
 typedef uint32_t lib9p_dm_t;
 LO_IMPLEMENTATION_H(fmt_formatter, lib9p_dm_t, lib9p_dm);
@@ -219,8 +227,8 @@ LO_IMPLEMENTATION_H(fmt_formatter, lib9p_dm_t, lib9p_dm);
 /* masks */
 #define   LIB9P_DM_PERM_MASK     ((lib9p_dm_t)(0b000000000000000000000111111111))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 /* size = 1 ; max_iov = 1 ; max_copy = 1 */
 typedef uint8_t lib9p_qt_t;
 LO_IMPLEMENTATION_H(fmt_formatter, lib9p_qt_t, lib9p_qt);
@@ -238,7 +246,7 @@ LO_IMPLEMENTATION_H(fmt_formatter, lib9p_qt_t, lib9p_qt);
 /* aliases */
 #define   LIB9P_QT_FILE          ((lib9p_qt_t)(0))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 1 ; max_iov = 1 ; max_copy = 1 */
 typedef uint8_t lib9p_o_t;
@@ -685,7 +693,7 @@ LO_IMPLEMENTATION_H(fmt_formatter, lib9p_lock_status_t, lib9p_lock_status);
 #define LIB9P_LOCK_STATUS_GRACE   ((lib9p_lock_status_t)(3))
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 /* min_size = 2 ; exp_size = 29 ; max_size = 65,537 ; max_iov = 2 ; max_copy = 2 */
 struct lib9p_s {
 	uint16_t                  len;
@@ -701,6 +709,8 @@ struct lib9p_qid {
 };
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_qid, lib9p_qid);
 
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 9 ; max_iov = 1 ; max_copy = 9 */
 struct lib9p_msg_Tflush {
 	lib9p_tag_t   tag;
@@ -999,28 +1009,28 @@ LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Rswrite, lib9p_msg_Rswrite);
 /* LIB9P_VER_9P2000_p9p: min_size = 49 ; exp_size = 157 ; max_size = 262,189 ; max_iov = 8 ; max_copy = 49 */
 /* LIB9P_VER_9P2000_u  : min_size = 63 ; exp_size = 198 ; max_size = 327,738 ; max_iov = 11 ; max_copy = 63 */
 struct lib9p_stat {
-	uint16_t           kern_type;
-	uint32_t           kern_dev;
-	struct lib9p_qid   file_qid;
-	lib9p_dm_t         file_mode;
-	uint32_t           file_atime;
-	uint32_t           file_mtime;
-	uint64_t           file_size;
-	struct lib9p_s     file_name;
-	struct lib9p_s     file_owner_uid;
-	struct lib9p_s     file_owner_gid;
-	struct lib9p_s     file_last_modified_uid;
+	uint16_t           fstype;
+	uint32_t           fsdev;
+	struct lib9p_qid   qid;
+	lib9p_dm_t         mode;
+	uint32_t           atime;
+	uint32_t           mtime;
+	uint64_t           length;
+	struct lib9p_s     name;
+	struct lib9p_s     owner_uname;
+	struct lib9p_s     owner_gname;
+	struct lib9p_s     last_modifier_uname;
 #if CONFIG_9P_ENABLE_9P2000_u
-	struct lib9p_s     file_extension;
-	lib9p_nuid_t       file_owner_n_uid;
-	lib9p_nuid_t       file_owner_n_gid;
-	lib9p_nuid_t       file_last_modified_n_uid;
+	struct lib9p_s     extension;
+	lib9p_nuid_t       owner_unum;
+	lib9p_nuid_t       owner_gnum;
+	lib9p_nuid_t       last_modifier_unum;
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_stat, lib9p_stat);
 
 #endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 /* min_size = 13 ; exp_size = 40 ; max_size = 65,548 ; max_iov = 2 ; max_copy = 13 */
 struct lib9p_msg_Tversion {
 	lib9p_tag_t      tag;
@@ -1037,6 +1047,8 @@ struct lib9p_msg_Rversion {
 };
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Rversion, lib9p_msg_Rversion);
 
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* LIB9P_VER_9P2000    : min_size = 15 ; exp_size = 69 ; max_size = 131,085 ; max_iov = 4 ; max_copy = 15 */
 /* LIB9P_VER_9P2000_L  : min_size = 19 ; exp_size = 73 ; max_size = 131,089 ; max_iov = 5 ; max_copy = 19 */
 /* LIB9P_VER_9P2000_e  : min_size = 15 ; exp_size = 69 ; max_size = 131,085 ; max_iov = 4 ; max_copy = 15 */
@@ -1048,7 +1060,7 @@ struct lib9p_msg_Tauth {
 	struct lib9p_s   uname;
 	struct lib9p_s   aname;
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-	lib9p_nuid_t     n_uid;
+	lib9p_nuid_t     unum;
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 };
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Tauth, lib9p_msg_Tauth);
@@ -1072,7 +1084,7 @@ struct lib9p_msg_Tattach {
 	struct lib9p_s   uname;
 	struct lib9p_s   aname;
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-	lib9p_nuid_t     n_uid;
+	lib9p_nuid_t     unum;
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 };
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Tattach, lib9p_msg_Tattach);
@@ -1085,11 +1097,12 @@ struct lib9p_msg_Rattach {
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Rattach, lib9p_msg_Rattach);
 
 #endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown
 /* LIB9P_VER_9P2000    : min_size = 9 ; exp_size = 36 ; max_size = 65,544 ; max_iov = 2 ; max_copy = 9 */
 /* LIB9P_VER_9P2000_e  : min_size = 9 ; exp_size = 36 ; max_size = 65,544 ; max_iov = 2 ; max_copy = 9 */
 /* LIB9P_VER_9P2000_p9p: min_size = 9 ; exp_size = 36 ; max_size = 65,544 ; max_iov = 2 ; max_copy = 9 */
 /* LIB9P_VER_9P2000_u  : min_size = 13 ; exp_size = 40 ; max_size = 65,548 ; max_iov = 3 ; max_copy = 13 */
+/* LIB9P_VER_unknown   : min_size = 9 ; exp_size = 36 ; max_size = 65,544 ; max_iov = 2 ; max_copy = 9 */
 struct lib9p_msg_Rerror {
 	lib9p_tag_t      tag;
 	struct lib9p_s   errstr;
@@ -1099,7 +1112,7 @@ struct lib9p_msg_Rerror {
 };
 LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Rerror, lib9p_msg_Rerror);
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_unknown */
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* min_size = 17 ; exp_size = 481 ; max_size = 1,048,609 ; max_iov = 32 ; max_copy = 49 */
 struct lib9p_msg_Twalk {
@@ -1421,6 +1434,8 @@ LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Twstat, lib9p_msg_Twstat);
 	#else
 		#define LIB9P_TMSG_MAX_IOV 32
 	#endif
+#elif CONFIG_9P_ENABLE_unknown
+	#define LIB9P_TMSG_MAX_IOV 2
 #endif
 
 #if CONFIG_9P_ENABLE_9P2000_u
@@ -1441,18 +1456,22 @@ LO_IMPLEMENTATION_H(fmt_formatter, struct lib9p_msg_Twstat, lib9p_msg_Twstat);
 	#else
 		#define LIB9P_TMSG_MAX_COPY 62
 	#endif
+#elif CONFIG_9P_ENABLE_unknown
+	#define LIB9P_TMSG_MAX_COPY 13
 #endif
 
 #if CONFIG_9P_ENABLE_9P2000_u
 	#define LIB9P_RMSG_MAX_IOV 11
 #elif CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p
 	#define LIB9P_RMSG_MAX_IOV 8
-#elif CONFIG_9P_ENABLE_9P2000_L
+#elif CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_unknown
 	#define LIB9P_RMSG_MAX_IOV 2
 #endif
 
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	#define LIB9P_RMSG_MAX_COPY 217
+#elif CONFIG_9P_ENABLE_unknown
+	#define LIB9P_RMSG_MAX_COPY 13
 #endif
 
 struct lib9p_Tmsg_send_buf {
diff --git a/lib9p/core_include/lib9p/core.h b/lib9p/core_include/lib9p/core.h
index ff822ed..38f3934 100644
--- a/lib9p/core_include/lib9p/core.h
+++ b/lib9p/core_include/lib9p/core.h
@@ -12,6 +12,7 @@
 
 #include <libmisc/assert.h>
 
+#define CONFIG_9P_ENABLE_unknown 1
 #include <lib9p/_core_generated.h>
 
 #ifndef CONFIG_9P_MAX_ERR_SIZE
@@ -45,7 +46,7 @@ struct lib9p_ctx {
 	uint32_t                max_msg_size;
 
 	/* state */
-#ifdef CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
 	lib9p_errno_t           err_num;
 #endif
 	[[gnu::nonstring]] char err_msg[CONFIG_9P_MAX_ERR_SIZE];
@@ -56,9 +57,31 @@ void lib9p_ctx_clear_error(struct lib9p_ctx *ctx);
 bool lib9p_ctx_has_error(struct lib9p_ctx *ctx);
 
 /** Write an static error into ctx, return -1.  */
-int lib9p_error(struct lib9p_ctx *ctx, lib9p_errno_t linux_errno, char const *msg);
+int lib9p_error(struct lib9p_ctx *ctx,
+#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
+                lib9p_errno_t linux_errno,
+#endif
+                char const *msg);
 /** Write a printf-style error into ctx, return -1.  */
-int lib9p_errorf(struct lib9p_ctx *ctx, lib9p_errno_t linux_errno, char const *fmt, ...) [[gnu::format(printf, 3, 4)]];
+int lib9p_errorf(struct lib9p_ctx *ctx,
+#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
+                 lib9p_errno_t linux_errno,
+#endif
+                 char const *fmt, ...)
+#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
+	[[gnu::format(printf, 3, 4)]]
+#else
+	[[gnu::format(printf, 2, 3)]]
+#endif
+	;
+
+#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
+/* Detect things that should be just lib9p_error() */
+#define lib9p_errorf(ctx, errnum, fmt, ...) lib9p_errorf(ctx, errnum, fmt, __VA_ARGS__)
+#else
+#define lib9p_errorf(ctx, errnum, fmt, ...) lib9p_errorf(ctx, fmt, __VA_ARGS__)
+#define lib9p_error(ctx, errnum, errmsg) lib9p_error(ctx, errmsg)
+#endif
 
 /* misc utilities *************************************************************/
 
@@ -143,16 +166,7 @@ bool lib9p_Rmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *bo
 
 /* `struct lib9p_stat` helpers ************************************************/
 
-/** Assert that a `struct lib9p_stat` object looks valid.  */
-static inline void lib9p_stat_assert(struct lib9p_stat stat) {
-	assert( ((bool)(stat.file_mode & LIB9P_DM_DIR   )) == ((bool)(stat.file_qid.type & LIB9P_QT_DIR   )) );
-	assert( ((bool)(stat.file_mode & LIB9P_DM_APPEND)) == ((bool)(stat.file_qid.type & LIB9P_QT_APPEND)) );
-	assert( ((bool)(stat.file_mode & LIB9P_DM_EXCL  )) == ((bool)(stat.file_qid.type & LIB9P_QT_EXCL  )) );
-	assert( ((bool)(stat.file_mode & LIB9P_DM_AUTH  )) == ((bool)(stat.file_qid.type & LIB9P_QT_AUTH  )) );
-	assert( ((bool)(stat.file_mode & LIB9P_DM_TMP   )) == ((bool)(stat.file_qid.type & LIB9P_QT_TMP   )) );
-	assert( (stat.file_size == 0) || !(stat.file_mode & LIB9P_DM_DIR) );
-}
-
+#if _LIB9P_ENABLE_stat
 /**
  * Validate a message's `stat` structure.
  *
@@ -201,5 +215,6 @@ void lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
  */
 uint32_t lib9p_stat_marshal(struct lib9p_ctx *ctx, uint32_t max_net_size, struct lib9p_stat *obj,
                             uint8_t *ret_bytes);
+#endif
 
 #endif /* _LIB9P_CORE_H_ */