From 6876381276ff2c2a40d304ada27651fdaf1cd8a7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 22 Feb 2021 08:18:13 +0000
Subject: Move config file path expansion much earlier, keep the list of paths
 around rather than freeing later, and add a config_files format variable
 containing it. Suggested by kn@ a while back.

---
 format.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 014f1385..9fa6fc47 100644
--- a/format.c
+++ b/format.c
@@ -1412,6 +1412,26 @@ format_cb_client_written(struct format_tree *ft)
 	return (NULL);
 }
 
+/* Callback for config_files. */
+static void *
+format_cb_config_files(__unused struct format_tree *ft)
+{
+	char	*s = NULL;
+	size_t	 slen = 0;
+	u_int	 i;
+	size_t	 n;
+
+	for (i = 0; i < cfg_nfiles; i++) {
+		n = strlen(cfg_files[i]) + 1;
+		s = xrealloc(s, slen + n + 1);
+		slen += xsnprintf(s + slen, n + 1, "%s,", cfg_files[i]);
+	}
+	if (s == NULL)
+		return (xstrdup(""));
+	s[slen - 1] = '\0';
+	return (s);
+}
+
 /* Callback for cursor_flag. */
 static void *
 format_cb_cursor_flag(struct format_tree *ft)
@@ -2569,6 +2589,9 @@ static const struct format_table_entry format_table[] = {
 	{ "client_written", FORMAT_TABLE_STRING,
 	  format_cb_client_written
 	},
+	{ "config_files", FORMAT_TABLE_STRING,
+	  format_cb_config_files
+	},
 	{ "cursor_character", FORMAT_TABLE_STRING,
 	  format_cb_cursor_character
 	},
-- 
cgit