Skip to content

On Ubuntu, GetTimezone should return the long time zone name. #1380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 6, 2023
Merged

On Ubuntu, GetTimezone should return the long time zone name. #1380

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36b562b
On Ubuntu, GetTimezone should return the long time zone name.
jonsimantov Jul 6, 2023
d1bc8ee
Fix buffer size.
jonsimantov Jul 6, 2023
a4f90bf
Format code.
jonsimantov Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions app/src/locale.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#define UCHAR_TYPE wchar_t
#include <icu.h>
#elif FIREBASE_PLATFORM_LINUX
#include <stdio.h>

#include <clocale>
#include <ctime>
#else
Expand Down Expand Up @@ -180,6 +182,20 @@ std::string GetTimezone() {
return iana_tz_utf8;

#elif FIREBASE_PLATFORM_LINUX
// Ubuntu: Check /etc/timezone for the full time zone name.
FILE* tz_file = fopen("/etc/timezone", "r");
if (tz_file) {
const size_t kBufSize = 128;
char buf[kBufSize];
if (fgets(buf, kBufSize, tz_file)) {
// Remove a trailing '\n', if any.
size_t len = strlen(buf);
if (buf[len - 1] == '\n') {
buf[len - 1] = '\0';
}
return std::string(buf);
}
}
// If TZ environment variable is defined and not empty, use it, else use
// tzname.
return (getenv("TZ") && *getenv("TZ")) ? getenv("TZ")
Expand Down