Added braces

[i3/i3status] / src / print_time.c

diff --git a/src/print_time.c b/src/print_time.c
index c70a09c7a830f68f2eb5371e650d12128ca9328c..c8da9d67087da12c3893504aa86178334913956a 100644 (file)
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <locale.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_version.h>
 
@@ -33,17 +34,44 @@ 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 *locale, 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 (locale != NULL) {
+        setlocale(LC_ALL, locale);
+    }
+
+    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");
+            }
+        }
+    }
+
+    if (locale != NULL) {
+        setlocale(LC_ALL, "");
+    }
+
     *outwalk = '\0';
     OUTPUT_FULL_TEXT(buffer);
 }