Merge branch 'obsd-master'

2015-05-20 10:01:19 +01:00 · 2015-05-20 10:01:19 +01:00 · f538f2ae9b
parent 1ec93570bf 7140cce7f3
commit f538f2ae9b
1 changed files with 1 additions and 1 deletions
--- a/format.c
+++ b/format.c
@ -336,7 +336,7 @@ format_expand_time(struct format_tree *ft, const char *fmt, time_t t)
 	size_t		 tmplen;
 	struct tm	*tm;

-	if (fmt == NULL)
+	if (fmt == NULL || *fmt == '\0')
 		return (xstrdup(""));

 	tm = localtime(&t);