X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/7487f3478dd948824e2ec5898a439d08c63dcdf2..e4b47618f00dc9ae93ccc24a9271d92faec63536:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 6ff14187..6ff0dbf3 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -260,7 +260,9 @@ static void a_flush(int fd, unsigned mode, void *v)
  *
  *		  * "?PEER" PEER -- peer's name
  *
- *		  * "?ERRNO" ERRNO -- system error code
+ *		  * "?ERR" CODE -- system error code
+ *
+ *		  * "?ERRNO" -- system error code from @errno@
  *
  *		  * "[!]..." ... -- @dstr_putf@-like string as single token
  */
@@ -303,7 +305,11 @@ void a_vformat(dstr *d, const char *fmt, va_list *ap)
 	while (*av) u_quotify(d, *av++);
       } else if (strcmp(fmt, "?PEER") == 0)
 	u_quotify(d, p_name(va_arg(*ap, peer *)));
-      else if (strcmp(fmt, "?ERRNO") == 0) {
+      else if (strcmp(fmt, "?ERR") == 0) {
+	int e = va_arg(*ap, int);
+	dstr_putf(d, " E%d", e);
+	u_quotify(d, strerror(e));
+      } else if (strcmp(fmt, "?ERRNO") == 0) {
 	dstr_putf(d, " E%d", errno);
 	u_quotify(d, strerror(errno));
       } else