From 5162fec2ba8dab56d5ad2593c694ca71f71690bf Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 21 May 2000 01:38:02 +0000
Subject: [PATCH] (vsyslog): actually haandle %m

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8276 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/roken/vsyslog.c | 56 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/lib/roken/vsyslog.c b/lib/roken/vsyslog.c
index 0bc164c2d..98dc2b021 100644
--- a/lib/roken/vsyslog.c
+++ b/lib/roken/vsyslog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -44,14 +44,58 @@ RCSID("$Id$");
 
 #include "roken.h"
 
+static void
+simple_vsyslog(int pri, const char *fmt, va_list ap)
+{
+    syslog (pri, "%s", fmt);
+}
+
 void
 vsyslog(int pri, const char *fmt, va_list ap)
 {
-    char *p;
+    char *fmt2;
+    const char *p;
+    char *p2;
+    int saved_errno = errno;
+    int fmtlen = strlen (fmt);
+    char *buf;
 
-    vasprintf (&p, fmt, ap);
-    syslog (pri, "%s", p);
-    free (p);
+    fmt2 = malloc (fmtlen + 1);
+    if (fmt2 == NULL) {
+	simple_vsyslog (pri, fmt, ap);
+	return;
+    }
+
+    for (p = fmt, p2 = fmt2; *p != '\0'; ++p) {
+	if (p[0] == '%' && p[1] == 'm') {
+	    const char *e = strerror (saved_errno);
+	    int e_len = strlen (e);
+	    char *tmp;
+	    int pos;
+
+	    pos = p2 - fmt2;
+	    tmp = realloc (fmt2, fmtlen + 1 + e_len - 2);
+	    if (tmp == NULL) {
+		free (fmt2);
+		simple_vsyslog (pri, fmt, ap);
+		return;
+	    }
+	    fmt2 = tmp;
+	    p2   = fmt2 + pos;
+	    memmove (p2, e, e_len);
+	    p2 += e_len;
+	    ++p;
+	} else
+	    *p2++ = *p;
+    }
+
+    vasprintf (&buf, fmt2, ap);
+    free (fmt2);
+    if (buf == NULL) {
+	simple_vsyslog (pri, fmt, ap);
+	return;
+    }
+    syslog (pri, "%s", buf);
+    free (buf);
 }
-
 #endif