s/\<timezone\>/tz/ in order to not shadow the timezone var from time.h

[i3/i3status] / src / print_time.c

diff --git a/src/print_time.c b/src/print_time.c
index 3c48d3f8e5a1188ffeb20db90aca17c88d32a81a..e007419314bef688ea6b74ec00e172e9dd8107c8 100644 (file)
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -2,19 +2,44 @@
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
-void print_time(const char *format, struct tm *current_tm) {
-        static char part[512];
-        /* Get date & time */
-        if (current_tm == NULL) {
-                return;
+static int local_timezone_init = 0;
+static const char *local_timezone = NULL;
+static const char *current_timezone = NULL;
+
+void set_timezone(const char *tz) {
+        if (!local_timezone_init) {
+                /* First call, initialize. */
+                local_timezone = getenv("TZ");
+                local_timezone_init = 1;
+        }
+        if (tz == NULL || tz[0] == '\0') {
+                /* User wants localtime. */
+                tz = local_timezone;
+        }
+        if (tz != current_timezone) {
+                if (tz) {
+                        setenv("TZ", tz, 1);
+                } else {
+                        unsetenv("TZ");
+                }
+                tzset();
+                current_timezone = tz;
         }
-        if (output_format == O_I3BAR)
-                printf("{\"name\":\"time\", \"full_text\":\"");
-        (void)strftime(part, sizeof(part), format, current_tm);
-        printf("%s", part);
-        if (output_format == O_I3BAR)
-                printf("\"}");
+}
+
+void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t) {
+        char *outwalk = buffer;
+        struct tm tm;
+
+        /* Convert time and format output. */
+        set_timezone(tz);
+        localtime_r(&t, &tm);
+        outwalk += strftime(outwalk, 4095, format, &tm);
+        *outwalk = '\0';
+        OUTPUT_FULL_TEXT(buffer);
 }