X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedatectl.c;h=a8769e41809cb485cae4fc895047c343d0c63aa8;hp=9b81513c75456664b2749c5898318b2a54e470d5;hb=609896125cb89cac2fcd5b80b532de97d7a64c0a;hpb=adacb9575a09981fcf11279f2f661e3fc21e58ff diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 9b81513c7..a8769e418 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -98,31 +98,44 @@ static void print_status_info(const StatusInfo *i) { char s[32]; struct tm tm; time_t sec; - char *zc, *zn; + bool have_time = false; + _cleanup_free_ char *zc = NULL, *zn = NULL; time_t t, tc, tn; - int dn; - bool is_dstc, is_dstn; + int dn = 0; + bool is_dstc = false, is_dstn = false; int r; assert(i); /* Enforce the values of /etc/localtime */ if (getenv("TZ")) { - fprintf(stderr, "Warning: ignoring the TZ variable, reading the system's timezone setting only.\n\n"); + fprintf(stderr, "Warning: Ignoring the TZ variable. Reading the system's time zone setting only.\n\n"); unsetenv("TZ"); } - sec = (time_t) (i->time / USEC_PER_SEC); + if (i->time != 0) { + sec = (time_t) (i->time / USEC_PER_SEC); + have_time = true; + } else if (arg_transport == BUS_TRANSPORT_LOCAL) { + sec = time(NULL); + have_time = true; + } else + fprintf(stderr, "Warning: Could not get time from timedated and not operating locally.\n\n"); - zero(tm); - assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&sec, &tm)) > 0); - char_array_0(a); - printf(" Local time: %s\n", a); + if (have_time) { + zero(tm); + assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&sec, &tm)) > 0); + char_array_0(a); + printf(" Local time: %s\n", a); - zero(tm); - assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S UTC", gmtime_r(&sec, &tm)) > 0); - char_array_0(a); - printf(" Universal time: %s\n", a); + zero(tm); + assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S UTC", gmtime_r(&sec, &tm)) > 0); + char_array_0(a); + printf(" Universal time: %s\n", a); + } else { + printf(" Local time: %s\n", "n/a"); + printf(" Universal time: %s\n", "n/a"); + } if (i->rtc_time > 0) { time_t rtc_sec; @@ -133,64 +146,67 @@ static void print_status_info(const StatusInfo *i) { char_array_0(a); printf(" RTC time: %s\n", a); } else - printf(" RTC time: n/a\n"); + printf(" RTC time: %s\n", "n/a"); - zero(tm); - assert_se(strftime(a, sizeof(a), "%Z, %z", localtime_r(&sec, &tm)) > 0); - char_array_0(a); - printf(" Timezone: %s (%s)\n" + if (have_time) { + zero(tm); + assert_se(strftime(a, sizeof(a), "%Z, %z", localtime_r(&sec, &tm)) > 0); + char_array_0(a); + } + + printf(" Time zone: %s (%s)\n" " NTP enabled: %s\n" "NTP synchronized: %s\n" " RTC in local TZ: %s\n", - strna(i->timezone), a, + strna(i->timezone), have_time ? a : "n/a", i->ntp_capable ? yes_no(i->ntp_enabled) : "n/a", yes_no(i->ntp_synced), yes_no(i->rtc_local)); - r = time_get_dst(sec, "/etc/localtime", - &tc, &zc, &is_dstc, - &tn, &dn, &zn, &is_dstn); - if (r < 0) - printf(" DST active: n/a\n"); - else { + 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; + zero(tm); + assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&t, &tm)) > 0); + char_array_0(a); + + zero(tm); + assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tc, &tm)) > 0); + char_array_0(b); + printf(" Last DST change: DST %s at\n" + " %s\n" + " %s\n", + is_dstc ? "began" : "ended", a, b); + + t = tn - 1; + zero(tm); + assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&t, &tm)) > 0); + char_array_0(a); + + zero(tm); + assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tn, &tm)) > 0); + char_array_0(b); + 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)), a, b); + } + } else printf(" DST active: %s\n", yes_no(is_dstc)); - t = tc - 1; - zero(tm); - assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&t, &tm)) > 0); - char_array_0(a); - - zero(tm); - assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tc, &tm)) > 0); - char_array_0(b); - printf(" Last DST change: DST %s at\n" - " %s\n" - " %s\n", - is_dstc ? "began" : "ended", a, b); - - t = tn - 1; - zero(tm); - assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&t, &tm)) > 0); - char_array_0(a); - - zero(tm); - assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tn, &tm)) > 0); - char_array_0(b); - 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)), a, b); - - free(zc); - free(zn); - } - if (i->rtc_local) fputs("\n" ANSI_HIGHLIGHT_ON - "Warning: The RTC is configured to maintain time in the local timezone. This\n" + "Warning: The RTC is configured to maintain time in the local time zone. This\n" " mode is not fully supported and will create various problems with time\n" - " zone changes and daylight saving adjustments. If at all possible use\n" - " RTC in UTC, by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout); + " zone changes and daylight saving time adjustments. If at all possible, use\n" + " RTC in UTC by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout); } static int show_status(sd_bus *bus, char **args, unsigned n) { @@ -275,7 +291,7 @@ static int set_timezone(sd_bus *bus, char **args, unsigned n) { NULL, "sb", args[1], arg_ask_password); if (r < 0) - log_error("Failed to set timezone: %s", bus_error_message(&error, -r)); + log_error("Failed to set time zone: %s", bus_error_message(&error, -r)); return r; } @@ -348,7 +364,7 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) { f = fopen("/usr/share/zoneinfo/zone.tab", "re"); if (!f) { - log_error("Failed to open timezone database: %m"); + log_error("Failed to open time zone database: %m"); return -errno; } @@ -360,7 +376,7 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) { if (feof(f)) break; - log_error("Failed to read timezone database: %m"); + log_error("Failed to read time zone database: %m"); return -errno; } @@ -369,7 +385,6 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) { if (isempty(p) || *p == '#') continue; - /* Skip over country code */ p += strcspn(p, WHITESPACE); p += strspn(p, WHITESPACE); @@ -412,7 +427,7 @@ static int help(void) { printf("%s [OPTIONS...] COMMAND ...\n\n" "Query or change system time and date settings.\n\n" - " -h --help Show this help\n" + " -h --help Show this help message\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" " --no-ask-password Do not prompt for password\n" @@ -422,8 +437,8 @@ static int help(void) { "Commands:\n" " status Show current time settings\n" " set-time TIME Set system time\n" - " set-timezone ZONE Set system timezone\n" - " list-timezones Show known timezones\n" + " 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", program_invocation_short_name);