From c5338fd6c40d08472b680809cfa04d47826bdcf5 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 6 Jun 2015 05:35:38 +0200 Subject: Add OS.get_time_zone_info function The returned dictionary maps "name" to the name of the current time zone, and "bias" to a bias from UTC in minutes. --- drivers/unix/os_unix.cpp | 29 ++++++++++++++++++++++++++++- drivers/unix/os_unix.h | 1 + 2 files changed, 29 insertions(+), 1 deletion(-) (limited to 'drivers/unix') diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index afb85e49e8..8ba56490d7 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -246,9 +246,36 @@ OS::Time OS_Unix::get_time(bool utc) const { ret.hour=lt->tm_hour; ret.min=lt->tm_min; ret.sec=lt->tm_sec; + get_time_zone_info(); return ret; } - + +OS::TimeZoneInfo OS_Unix::get_time_zone_info() const { + time_t t = time(NULL); + struct tm *lt = localtime(&t); + char name[16]; + strftime(name, 16, "%Z", lt); + name[15] = 0; + TimeZoneInfo ret; + ret.name = name; + + char bias_buf[16]; + strftime(bias_buf, 16, "%z", lt); + int bias; + bias_buf[15] = 0; + sscanf(bias_buf, "%d", &bias); + + // convert from ISO 8601 (1 minute=1, 1 hour=100) to minutes + int hour = (int)bias / 100; + int minutes = bias % 100; + if (bias < 0) + ret.bias = hour * 60 - minutes; + else + ret.bias = hour * 60 + minutes; + + return ret; +} + void OS_Unix::delay_usec(uint32_t p_usec) const { usleep(p_usec); diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index bafa590d5f..8bb57eda12 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -90,6 +90,7 @@ public: virtual Date get_date(bool utc) const; virtual Time get_time(bool utc) const; + virtual TimeZoneInfo get_time_zone_info() const; virtual uint64_t get_unix_time() const; -- cgit v1.2.3