From: Martin Willi <martin@revosec.ch>
Date: Mon, 8 Oct 2012 10:35:44 +0000 (+0200)
Subject: Support field with specifiers in %N printf hook
X-Git-Tag: 5.0.2dr4~320
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2232d88569bb58e8a6579dd301b45097ceaf4738;p=thirdparty%2Fstrongswan.git

Support field with specifiers in %N printf hook
---

diff --git a/src/libstrongswan/enum.c b/src/libstrongswan/enum.c
index 2dc7c5dde1..9b3c4d5662 100644
--- a/src/libstrongswan/enum.c
+++ b/src/libstrongswan/enum.c
@@ -65,15 +65,17 @@ int enum_printf_hook(printf_hook_data_t *data, printf_hook_spec_t *spec,
 {
 	enum_name_t *ed = *((enum_name_t**)(args[0]));
 	int val = *((int*)(args[1]));
+	char *name, buf[32];
 
-	char *name = enum_to_name(ed, val);
-
+	name = enum_to_name(ed, val);
 	if (name == NULL)
 	{
-		return print_in_hook(data, "(%d)", val);
+		snprintf(buf, sizeof(buf), "(%d)", val);
+		name = buf;
 	}
-	else
+	if (spec->minus)
 	{
-		return print_in_hook(data, "%s", name);
+		return print_in_hook(data, "%-*s", spec->width, name);
 	}
+	return print_in_hook(data, "%*s", spec->width, name);
 }