From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 14 Jun 2022 18:30:58 +0000 (-0500)
Subject: Add fr_perror_to_str to help with wasm debugging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31590e860b605792852b0d3f9b1965d23562c065;p=thirdparty%2Ffreeradius-server.git

Add fr_perror_to_str to help with wasm debugging
---

diff --git a/src/lib/util/strerror.c b/src/lib/util/strerror.c
index 5ffe513e271..4204e716d77 100644
--- a/src/lib/util/strerror.c
+++ b/src/lib/util/strerror.c
@@ -720,3 +720,49 @@ void fr_perror(char const *fmt, ...)
 	}
 	talloc_free(prefix);
 }
+
+/** Print the stack of string buffers to a thread local buffer
+ *
+ * Used by utility functions lacking their own logging infrastructure
+ *
+ * @hidecallergraph
+ *
+ * @param[in] line_sep	to insert between the log lines.
+ * @param[in] fmt	to prefix all log messages with.
+ * @return
+ *	- A thread local string buffer containing the concatenated messages.
+ */
+char const *fr_perror_to_str(char const *line_sep, char const *fmt, ...)
+{
+	char const	*error;
+	char const	*subject;
+	size_t		offset;
+	char		*prefix;
+	va_list		ap;
+	fr_sbuff_t	*agg;
+
+	FR_SBUFF_TALLOC_THREAD_LOCAL(&agg, 256, SIZE_MAX);
+
+	va_start(ap, fmt);
+	prefix = talloc_vasprintf(NULL, fmt, ap);
+	if (unlikely(!prefix)) return NULL;
+	va_end(ap);
+
+	error = fr_strerror_marker_pop(&subject, &offset);
+	if (error) {
+		if (fr_sbuff_in_sprintf(agg, "%s: %s%s", prefix, error, line_sep) < 0) return NULL;
+	} else {
+		if (fr_sbuff_in_sprintf(agg, "%s%s", prefix, error, line_sep) < 0) return NULL;
+		talloc_free(prefix);
+		return NULL;
+	}
+
+	while ((error = fr_strerror_marker_pop(&subject, &offset))) {
+		if (error && (error[0] != '\0')) {
+			if (fr_sbuff_in_sprintf(agg, "%s: %s%s", prefix, error, line_sep) < 0) return NULL;
+		}
+	}
+	talloc_free(prefix);
+
+	return fr_sbuff_start(agg);
+}
diff --git a/src/lib/util/strerror.h b/src/lib/util/strerror.h
index cc1032d34b6..1a7f6c49b44 100644
--- a/src/lib/util/strerror.h
+++ b/src/lib/util/strerror.h
@@ -111,6 +111,9 @@ char const	*fr_strerror_marker_pop(char const **subject, size_t *offset) CC_HINT
 
 /** @hidecallergraph */
 void		fr_perror(char const *, ...) CC_HINT(format (printf, 1, 2));
+
+/** @hidecallergraph */
+char const	*fr_perror_to_str(char const *line_sep, char const *fmt, ...) CC_HINT(format (printf, 2, 3));
 /** @} */
 
 #ifdef __cplusplus