This file is part of systemd.
Copyright 2012 Lennart Poettering
+ Copyright 2013 Kay Sievers
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
#include "util.h"
#include "spawn-polkit-agent.h"
#include "build.h"
-#include "hwclock.h"
#include "strv.h"
#include "pager.h"
#include "time-dst.h"
-static bool arg_adjust_system_clock = false;
static bool arg_no_pager = false;
-static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
static bool arg_ask_password = true;
+static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
static char *arg_host = NULL;
+static bool arg_adjust_system_clock = false;
static void pager_open_if_enabled(void) {
static void polkit_agent_open_if_enabled(void) {
/* Open the polkit agent as a child process if necessary */
-
if (!arg_ask_password)
return;
}
typedef struct StatusInfo {
- const char *timezone;
- bool local_rtc;
- bool ntp;
- bool can_ntp;
+ usec_t time;
+ char *timezone;
+
+ usec_t rtc_time;
+ bool rtc_local;
+
+ bool ntp_enabled;
+ bool ntp_capable;
+ bool ntp_synced;
} StatusInfo;
static const char *jump_str(int delta_minutes, char *s, size_t size) {
return "";
}
-static void print_status_info(StatusInfo *i) {
- usec_t n;
+static void print_status_info(const StatusInfo *i) {
char a[FORMAT_TIMESTAMP_MAX];
char b[FORMAT_TIMESTAMP_MAX];
char s[32];
assert(i);
- /* enforce the values of /etc/localtime */
+ /* 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");
unsetenv("TZ");
}
- n = now(CLOCK_REALTIME);
- sec = (time_t) (n / USEC_PER_SEC);
+ sec = (time_t) (i->time / USEC_PER_SEC);
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(" Universal time: %s\n", a);
- zero(tm);
- r = hwclock_get_time(&tm);
- if (r >= 0) {
- /* Calculate the week-day */
- mktime(&tm);
+ if (i->rtc_time > 0) {
+ time_t rtc_sec;
- assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S", &tm) > 0);
+ rtc_sec = (time_t)(i->rtc_time / USEC_PER_SEC);
+ zero(tm);
+ assert_se(strftime(a, sizeof(a), "%a %Y-%m-%d %H:%M:%S", gmtime_r(&rtc_sec, &tm)) > 0);
char_array_0(a);
printf(" RTC time: %s\n", a);
- }
+ } else
+ printf(" RTC time: n/a\n");
zero(tm);
assert_se(strftime(a, sizeof(a), "%Z, %z", localtime_r(&sec, &tm)) > 0);
" NTP enabled: %s\n"
"NTP synchronized: %s\n"
" RTC in local TZ: %s\n",
- strna(i->timezone),
- a,
- i->can_ntp ? yes_no(i->ntp) : "n/a",
- yes_no(ntp_synced()),
- yes_no(i->local_rtc));
+ strna(i->timezone), 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,
free(zn);
}
- if (i->local_rtc)
+ if (i->rtc_local)
fputs("\n" ANSI_HIGHLIGHT_ON
"Warning: The RTC is configured to maintain time in the local timezone. This\n"
" mode is not fully supported and will create various problems with time\n"
" RTC in UTC, by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);
}
-static int get_timedate_property_bool(sd_bus *bus, const char *name, bool *target) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
-
- assert(name);
-
- r = sd_bus_get_property(bus,
- "org.freedesktop.timedate1",
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- name,
- &error,
- &reply,
- "b");
- if (r < 0) {
- log_error("Failed to get property: %s %s", name, bus_error_message(&error, -r));
- return r;
- }
-
- r = sd_bus_message_read(reply, "b", target);
- if (r < 0) {
- log_error("Failed to parse reply.");
- return r;
- }
-
- return 0;
-}
-
static int show_status(sd_bus *bus, char **args, unsigned n) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
StatusInfo info = {};
+ const struct bus_properties_map map[] = {
+ { "s", "Timezone", &info.timezone },
+ { "b", "LocalRTC", &info.rtc_local },
+ { "b", "NTP", &info.ntp_enabled },
+ { "b", "CanNTP", &info.ntp_capable },
+ { "b", "NTPSynchronized", &info.ntp_synced},
+ { "t", "TimeUSec", &info.time },
+ { "t", "RTCTimeUSec", &info.rtc_time },
+ {}
+ };
+ int r;
assert(bus);
- r = sd_bus_get_property(bus,
- "org.freedesktop.timedate1",
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- "Timezone",
- &error,
- &reply,
- "s");
- if (r < 0) {
- log_error("Failed to get property: Timezone %s", bus_error_message(&error, -r));
- return r;
- }
-
- r = sd_bus_message_read(reply, "s", &info.timezone);
- if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "LocalRTC", &info.local_rtc);
- if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "NTP", &info.ntp);
- if (r < 0)
- return r;
-
- r = get_timedate_property_bool(bus, "CanNTP", &info.can_ntp);
+ r = bus_map_all_properties(bus,
+ "org.freedesktop.timedate1",
+ "/org/freedesktop/timedate1",
+ map);
if (r < 0)
- return r;
+ goto fail;
print_status_info(&info);
- return 0;
+
+fail:
+ free(info.timezone);
+ return r;
}
static int set_time(sd_bus *bus, char **args, unsigned n) {
static int set_timezone(sd_bus *bus, char **args, unsigned n) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- bool interactive = arg_ask_password;
int r;
assert(args);
"SetTimezone",
&error,
NULL,
- "sb", args[1], interactive);
+ "sb", args[1], arg_ask_password);
if (r < 0)
log_error("Failed to set timezone: %s", bus_error_message(&error, -r));
static int set_local_rtc(sd_bus *bus, char **args, unsigned n) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- bool interactive = arg_ask_password, b, q;
- int r;
+ int r, b;
assert(args);
assert(n == 2);
polkit_agent_open_if_enabled();
- r = parse_boolean(args[1]);
- if (r < 0) {
+ b = parse_boolean(args[1]);
+ if (b < 0) {
log_error("Failed to parse local RTC setting: %s", args[1]);
- return r;
+ return b;
}
- b = r;
- q = arg_adjust_system_clock;
-
r = sd_bus_call_method(bus,
"org.freedesktop.timedate1",
"/org/freedesktop/timedate1",
"SetLocalRTC",
&error,
NULL,
- "bbb", b, q, interactive);
+ "bbb", b, arg_adjust_system_clock, arg_ask_password);
if (r < 0)
log_error("Failed to set local RTC: %s", bus_error_message(&error, -r));
static int set_ntp(sd_bus *bus, char **args, unsigned n) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- bool interactive = arg_ask_password, b;
- int r;
+ int b, r;
assert(args);
assert(n == 2);
polkit_agent_open_if_enabled();
- r = parse_boolean(args[1]);
- if (r < 0) {
+ b = parse_boolean(args[1]);
+ if (b < 0) {
log_error("Failed to parse NTP setting: %s", args[1]);
- return r;
+ return b;
}
- b = r;
-
r = sd_bus_call_method(bus,
"org.freedesktop.timedate1",
"/org/freedesktop/timedate1",
"SetNTP",
&error,
NULL,
- "bb", b, interactive);
+ "bb", b, arg_ask_password);
if (r < 0)
log_error("Failed to set ntp: %s", bus_error_message(&error, -r));
~ianmdlvl / elogind.git / blobdiff