X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedatectl.c;h=9b81513c75456664b2749c5898318b2a54e470d5;hp=48a3b49755dfcd4261a666109cd74d9954c3f067;hb=145b1f799ff6712f333cef92c44218254a1320c5;hpb=7f35b7bc4a241e9aa3b1512fd345cbf5b2e5a782 diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 48a3b4975..9b81513c7 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -38,11 +38,11 @@ #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) { @@ -58,12 +58,15 @@ static void polkit_agent_open_if_enabled(void) { if (!arg_ask_password) return; + if (arg_transport != BUS_TRANSPORT_LOCAL) + return; + polkit_agent_open(); } typedef struct StatusInfo { usec_t time; - const char *timezone; + char *timezone; usec_t rtc_time; bool rtc_local; @@ -89,7 +92,7 @@ static const char *jump_str(int delta_minutes, char *s, size_t size) { return ""; } -static void print_status_info(StatusInfo *i) { +static void print_status_info(const StatusInfo *i) { char a[FORMAT_TIMESTAMP_MAX]; char b[FORMAT_TIMESTAMP_MAX]; char s[32]; @@ -190,105 +193,37 @@ static void print_status_info(StatusInfo *i) { " 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, b; - - assert(name); - - r = sd_bus_get_property_trivial( - bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - name, - &error, - 'b', &b); - if (r < 0) { - log_error("Failed to get property: %s %s", name, bus_error_message(&error, -r)); - return r; - } - - *target = b; - return 0; -} - -static int get_timedate_property_usec(sd_bus *bus, const char *name, usec_t *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_trivial( - bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - name, - &error, - 't', target); - if (r < 0) { - log_error("Failed to get property: %s %s", name, bus_error_message(&error, -r)); - 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 = {}; + static const struct bus_properties_map map[] = { + { "Timezone", "s", NULL, offsetof(StatusInfo, timezone) }, + { "LocalRTC", "b", NULL, offsetof(StatusInfo, rtc_local) }, + { "NTP", "b", NULL, offsetof(StatusInfo, ntp_enabled) }, + { "CanNTP", "b", NULL, offsetof(StatusInfo, ntp_capable) }, + { "NTPSynchronized", "b", NULL, offsetof(StatusInfo, ntp_synced) }, + { "TimeUSec", "t", NULL, offsetof(StatusInfo, time) }, + { "RTCTimeUSec", "t", NULL, offsetof(StatusInfo, 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"); + r = bus_map_all_properties(bus, + "org.freedesktop.timedate1", + "/org/freedesktop/timedate1", + map, + &info); if (r < 0) { - log_error("Failed to get property: Timezone %s", bus_error_message(&error, -r)); - return r; + log_error("Failed to query server: %s", strerror(-r)); + goto fail; } - r = sd_bus_message_read(reply, "s", &info.timezone); - if (r < 0) - return r; - - r = get_timedate_property_bool(bus, "LocalRTC", &info.rtc_local); - if (r < 0) - return r; - - r = get_timedate_property_bool(bus, "NTP", &info.ntp_enabled); - if (r < 0) - return r; - - r = get_timedate_property_bool(bus, "CanNTP", &info.ntp_capable); - if (r < 0) - return r; - - r = get_timedate_property_bool(bus, "NTPSynchronized", &info.ntp_synced); - if (r < 0) - return r; - - r = get_timedate_property_usec(bus, "TimeUSec", &info.time); - if (r < 0) - return r; - - r = get_timedate_property_usec(bus, "RTCTimeUSec", &info.rtc_time); - if (r < 0) - return r; - print_status_info(&info); - return 0; + +fail: + free(info.timezone); + return r; } static int set_time(sd_bus *bus, char **args, unsigned n) { @@ -477,21 +412,20 @@ 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" - " --version Show package version\n" - " --adjust-system-clock\n" - " Adjust system clock when changing local RTC mode\n" - " --no-pager Do not pipe output into a pager\n" - " --no-ask-password Do not prompt for password\n" - " -H --host=[USER@]HOST Operate on remote host\n" - " -M --machine=CONTAINER Operate on local container\n\n" + " -h --help Show this help\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" + " -H --host=[USER@]HOST Operate on remote host\n" + " -M --machine=CONTAINER Operate on local container\n" + " --adjust-system-clock Adjust system clock when changing local RTC mode\n\n" "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-local-rtc BOOL Control whether RTC is in local time\n" - " set-ntp BOOL Control whether NTP is enabled\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-local-rtc BOOL Control whether RTC is in local time\n" + " set-ntp BOOL Control whether NTP is enabled\n", program_invocation_short_name); return 0; @@ -514,7 +448,7 @@ static int parse_argv(int argc, char *argv[]) { { "machine", required_argument, NULL, 'M' }, { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, { "adjust-system-clock", no_argument, NULL, ARG_ADJUST_SYSTEM_CLOCK }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -527,8 +461,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); @@ -561,8 +494,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } @@ -650,33 +582,27 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) { } int main(int argc, char *argv[]) { - int r, ret = EXIT_FAILURE; _cleanup_bus_unref_ sd_bus *bus = NULL; + int r; setlocale(LC_ALL, ""); log_parse_environment(); log_open(); r = parse_argv(argc, argv); - if (r < 0) + if (r <= 0) goto finish; - else if (r == 0) { - ret = EXIT_SUCCESS; - goto finish; - } r = bus_open_transport(arg_transport, arg_host, false, &bus); if (r < 0) { log_error("Failed to create bus connection: %s", strerror(-r)); - ret = EXIT_FAILURE; goto finish; } r = timedatectl_main(bus, argc, argv); - ret = r < 0 ? EXIT_FAILURE : r; finish: pager_close(); - return ret; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }