mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 20:25:38 +03:00
time-util: treat /etc/localtime missing as UTC
This commit is contained in:
parent
7b631898ef
commit
bc9ecd484f
@ -1387,13 +1387,22 @@ bool clock_supported(clockid_t clock) {
|
||||
}
|
||||
}
|
||||
|
||||
int get_timezone(char **tz) {
|
||||
int get_timezone(char **ret) {
|
||||
_cleanup_free_ char *t = NULL;
|
||||
const char *e;
|
||||
char *z;
|
||||
int r;
|
||||
|
||||
r = readlink_malloc("/etc/localtime", &t);
|
||||
if (r == -ENOENT) {
|
||||
/* If the symlink does not exist, assume "UTC", like glibc does*/
|
||||
z = strdup("UTC");
|
||||
if (!z)
|
||||
return -ENOMEM;
|
||||
|
||||
*ret = z;
|
||||
return 0;
|
||||
}
|
||||
if (r < 0)
|
||||
return r; /* returns EINVAL if not a symlink */
|
||||
|
||||
@ -1408,7 +1417,7 @@ int get_timezone(char **tz) {
|
||||
if (!z)
|
||||
return -ENOMEM;
|
||||
|
||||
*tz = z;
|
||||
*ret = z;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user