Add format_expand_time and use it instead of status_replace where

command execution is not needed.

1 files changed, 30 insertions, 0 deletions

diff --git a/format.c b/format.c
index f7cd3596..01fa3ade 100644
--- a/format.c
+++ b/format.c
@@ -326,6 +326,33 @@ fail:
 	return (-1);
 }
 
+/* Expand keys in a template, passing through strftime first. */
+char *
+format_expand_time(struct format_tree *ft, const char *fmt, time_t t)
+{
+	char		*tmp, *expanded;
+	size_t		 tmplen;
+	struct tm	*tm;
+
+	if (fmt == NULL)
+		return (xstrdup(""));
+
+	tm = localtime(&t);
+
+	tmp = NULL;
+	tmplen = strlen(fmt);
+
+	do {
+		tmp = xreallocarray(tmp, 2, tmplen);
+		tmplen *= 2;
+	} while (strftime(tmp, tmplen, fmt, tm) == 0);
+
+	expanded = format_expand(ft, tmp);
+	free(tmp);
+
+	return (expanded);
+}
+
 /* Expand keys in a template. */
 char *
 format_expand(struct format_tree *ft, const char *fmt)
@@ -335,6 +362,9 @@ format_expand(struct format_tree *ft, const char *fmt)
 	size_t		 off, len, n;
 	int     	 ch, brackets;
 
+	if (fmt == NULL)
+		return (xstrdup(""));
+
 	len = 64;
 	buf = xmalloc(len);
 	off = 0;