From dcd0518e25d7aa84a720780cb70b3f8fca867972 Mon Sep 17 00:00:00 2001 From: Kenneth Lyons Date: Mon, 5 Oct 2015 01:10:01 -0700 Subject: Added support for Pango markup. --- src/print_time.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/print_time.c') diff --git a/src/print_time.c b/src/print_time.c index c70a09c..9fa6642 100644 --- a/src/print_time.c +++ b/src/print_time.c @@ -33,17 +33,36 @@ void set_timezone(const char *tz) { } } -void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, time_t t) { +void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *format_time, time_t t) { + const char *walk; char *outwalk = buffer; struct tm tm; + char timebuf[1024]; if (title != NULL) INSTANCE(title); - /* Convert time and format output. */ set_timezone(tz); localtime_r(&t, &tm); - outwalk += strftime(outwalk, 4095, format, &tm); + + if (format_time == NULL) { + strftime(timebuf, sizeof(timebuf), format, &tm); + maybe_escape_markup(timebuf, &outwalk); + } else { + for (walk = format; *walk != '\0'; walk++) { + if (*walk != '%') { + *(outwalk++) = *walk; + continue; + } + + if (BEGINS_WITH(walk + 1, "time")) { + strftime(timebuf, sizeof(timebuf), format_time, &tm); + maybe_escape_markup(timebuf, &outwalk); + walk += strlen("time"); + } + } + } + *outwalk = '\0'; OUTPUT_FULL_TEXT(buffer); } -- cgit v1.2.3