diff options
Diffstat (limited to 'src/timedate/timedatectl.c')
| -rw-r--r-- | src/timedate/timedatectl.c | 97 |
1 files changed, 27 insertions, 70 deletions
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 4d89886736..61b6e765c7 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -22,11 +22,8 @@ #include <stdlib.h> #include <stdbool.h> -#include <unistd.h> #include <getopt.h> #include <locale.h> -#include <string.h> -#include <sys/timex.h> #include "sd-bus.h" #include "bus-util.h" @@ -36,7 +33,7 @@ #include "build.h" #include "strv.h" #include "pager.h" -#include "time-dst.h" +#include "terminal-util.h" static bool arg_no_pager = false; static bool arg_ask_password = true; @@ -76,51 +73,35 @@ typedef struct StatusInfo { bool ntp_synced; } StatusInfo; -static const char *jump_str(int delta_minutes, char *s, size_t size) { - if (delta_minutes == 60) - return "one hour forward"; - if (delta_minutes == -60) - return "one hour backwards"; - if (delta_minutes < 0) { - snprintf(s, size, "%i minutes backwards", -delta_minutes); - return s; - } - if (delta_minutes > 0) { - snprintf(s, size, "%i minutes forward", delta_minutes); - return s; - } - return ""; -} - static void print_status_info(const StatusInfo *i) { char a[FORMAT_TIMESTAMP_MAX]; - char b[FORMAT_TIMESTAMP_MAX]; - char s[32]; struct tm tm; time_t sec; bool have_time = false; - _cleanup_free_ char *zc = NULL, *zn = NULL; - time_t t, tc, tn; - int dn = 0; - bool is_dstc = false, is_dstn = false; + const char *old_tz = NULL, *tz; int r; assert(i); - /* Enforce the values of /etc/localtime */ - if (getenv("TZ")) { - fprintf(stderr, "Warning: Ignoring the TZ variable. Reading the system's time zone setting only.\n\n"); - unsetenv("TZ"); - } + /* Save the old $TZ */ + tz = getenv("TZ"); + if (tz) + old_tz = strdupa(tz); + + /* Set the new $TZ */ + if (setenv("TZ", i->timezone, true) < 0) + log_warning_errno(errno, "Failed to set TZ environment variable, ignoring: %m"); + else + tzset(); if (i->time != 0) { sec = (time_t) (i->time / USEC_PER_SEC); have_time = true; - } else if (arg_transport == BUS_TRANSPORT_LOCAL) { + } else if (IN_SET(arg_transport, BUS_TRANSPORT_LOCAL, BUS_TRANSPORT_MACHINE)) { sec = time(NULL); have_time = true; } else - fprintf(stderr, "Warning: Could not get time from timedated and not operating locally.\n\n"); + log_warning("Could not get time from timedated and not operating locally, ignoring."); if (have_time) { xstrftime(a, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&sec, &tm)); @@ -136,7 +117,7 @@ static void print_status_info(const StatusInfo *i) { if (i->rtc_time > 0) { time_t rtc_sec; - rtc_sec = (time_t)(i->rtc_time / USEC_PER_SEC); + rtc_sec = (time_t) (i->rtc_time / USEC_PER_SEC); xstrftime(a, "%a %Y-%m-%d %H:%M:%S", gmtime_r(&rtc_sec, &tm)); printf(" RTC time: %.*s\n", (int) sizeof(a), a); } else @@ -145,8 +126,18 @@ static void print_status_info(const StatusInfo *i) { if (have_time) xstrftime(a, "%Z, %z", localtime_r(&sec, &tm)); + /* Restore the $TZ */ + if (old_tz) + r = setenv("TZ", old_tz, true); + else + r = unsetenv("TZ"); + if (r < 0) + log_warning_errno(errno, "Failed to set TZ environment variable, ignoring: %m"); + else + tzset(); + printf(" Time zone: %s (%.*s)\n" - " NTP enabled: %s\n" + " Network time on: %s\n" "NTP synchronized: %s\n" " RTC in local TZ: %s\n", strna(i->timezone), (int) sizeof(a), have_time ? a : "n/a", @@ -154,40 +145,6 @@ static void print_status_info(const StatusInfo *i) { yes_no(i->ntp_synced), yes_no(i->rtc_local)); - if (have_time) { - r = time_get_dst(sec, "/etc/localtime", - &tc, &zc, &is_dstc, - &tn, &dn, &zn, &is_dstn); - if (r < 0) - printf(" DST active: %s\n", "n/a"); - else { - printf(" DST active: %s\n", yes_no(is_dstc)); - - t = tc - 1; - xstrftime(a, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&t, &tm)); - - xstrftime(b, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tc, &tm)); - printf(" Last DST change: DST %s at\n" - " %.*s\n" - " %.*s\n", - is_dstc ? "began" : "ended", - (int) sizeof(a), a, - (int) sizeof(b), b); - - t = tn - 1; - xstrftime(a, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&t, &tm)); - xstrftime(b, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tn, &tm)); - printf(" Next DST change: DST %s (the clock jumps %s) at\n" - " %.*s\n" - " %.*s\n", - is_dstn ? "begins" : "ends", - jump_str(dn, s, sizeof(s)), - (int) sizeof(a), a, - (int) sizeof(b), b); - } - } else - printf(" DST active: %s\n", yes_no(is_dstc)); - if (i->rtc_local) fputs("\n" ANSI_HIGHLIGHT_ON "Warning: The system is configured to read the RTC time in the local time zone. This\n" @@ -375,7 +332,7 @@ static void help(void) { " set-timezone ZONE Set system time zone\n" " list-timezones Show known time zones\n" " set-local-rtc BOOL Control whether RTC is in local time\n" - " set-ntp BOOL Control whether NTP is enabled\n", + " set-ntp BOOL Enable or disable network time synchronization\n", program_invocation_short_name); } |