Merge pull request #14010 from poettering/localtime-symlink

tweaks to /etc/localtime management
This commit is contained in:
Lennart Poettering
2019-11-13 16:38:41 +01:00
committed by GitHub
3 changed files with 36 additions and 15 deletions
+11 -2
View File
@@ -1391,13 +1391,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 */
@@ -1412,7 +1421,7 @@ int get_timezone(char **tz) {
if (!z)
return -ENOMEM;
*tz = z;
*ret = z;
return 0;
}