X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocalectl.c;h=fe2af27a24210ecc195c276df030dd03b957ac53;hp=b3acb3ec456f4e97e4aa08b226ca76a3ca3875f3;hb=e1636421f46db6d06fbd028ef20a3113fa3e11f8;hpb=17d33cecaa762f7e43200307328af5e9135e2091 diff --git a/src/locale/localectl.c b/src/locale/localectl.c index b3acb3ec4..fe2af27a2 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -4,6 +4,7 @@ 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 @@ -29,7 +30,10 @@ #include #include -#include "dbus-common.h" +#include "sd-bus.h" +#include "bus-util.h" +#include "bus-error.h" +#include "bus-message.h" #include "util.h" #include "spawn-polkit-agent.h" #include "build.h" @@ -37,15 +41,12 @@ #include "pager.h" #include "set.h" #include "path-util.h" +#include "utf8.h" static bool arg_no_pager = false; -static enum transport { - TRANSPORT_NORMAL, - TRANSPORT_SSH, - TRANSPORT_POLKIT -} arg_transport = TRANSPORT_NORMAL; static bool arg_ask_password = true; -static const char *arg_host = NULL; +static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; +static char *arg_host = NULL; static bool arg_convert = true; static void pager_open_if_enabled(void) { @@ -53,13 +54,12 @@ static void pager_open_if_enabled(void) { if (arg_no_pager) return; - pager_open(); + pager_open(false); } static void polkit_agent_open_if_enabled(void) { /* Open the polkit agent as a child process if necessary */ - if (!arg_ask_password) return; @@ -102,168 +102,166 @@ static void print_status_info(StatusInfo *i) { printf(" X11 Options: %s\n", i->x11_options); } -static int status_property(const char *name, DBusMessageIter *iter, StatusInfo *i) { +static int status_read_property(const char *name, sd_bus_message *property, StatusInfo *i) { + char type; + const char *contents; int r; assert(name); - assert(iter); + assert(property); - switch (dbus_message_iter_get_arg_type(iter)) { + r = sd_bus_message_peek_type(property, &type, &contents); + if (r < 0) { + log_error("Could not determine type of message: %s", strerror(-r)); + return r; + } - case DBUS_TYPE_STRING: { + switch (type) { + + case SD_BUS_TYPE_STRING: { const char *s; - dbus_message_iter_get_basic(iter, &s); - if (!isempty(s)) { - if (streq(name, "VConsoleKeymap")) - i->vconsole_keymap = s; - else if (streq(name, "VConsoleKeymapToggle")) - i->vconsole_keymap_toggle = s; - else if (streq(name, "X11Layout")) - i->x11_layout = s; - else if (streq(name, "X11Model")) - i->x11_model = s; - else if (streq(name, "X11Variant")) - i->x11_variant = s; - else if (streq(name, "X11Options")) - i->x11_options = s; - } + sd_bus_message_read_basic(property, type, &s); + if (isempty(s)) + break; + + if (streq(name, "VConsoleKeymap")) + i->vconsole_keymap = s; + else if (streq(name, "VConsoleKeymapToggle")) + i->vconsole_keymap_toggle = s; + else if (streq(name, "X11Layout")) + i->x11_layout = s; + else if (streq(name, "X11Model")) + i->x11_model = s; + else if (streq(name, "X11Variant")) + i->x11_variant = s; + else if (streq(name, "X11Options")) + i->x11_options = s; + break; } - case DBUS_TYPE_ARRAY: + case SD_BUS_TYPE_ARRAY: { + _cleanup_strv_free_ char **l = NULL; + + if (!streq(contents, "s")) + break; - if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRING) { - char **l; + if (!streq(name, "Locale")) + break; - r = bus_parse_strv_iter(iter, &l); - if (r < 0) - return r; + r = bus_message_read_strv_extend(property, &l); + if (r < 0) + break; - if (streq(name, "Locale")) { - strv_free(i->locale); - i->locale = l; - l = NULL; - } + strv_free(i->locale); + i->locale = l; + l = NULL; - strv_free(l); - } + break; + } } - return 0; + return r; } -static int show_status(DBusConnection *bus, char **args, unsigned n) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - const char *interface = ""; +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; - DBusMessageIter iter, sub, sub2, sub3; - StatusInfo info; + StatusInfo info = {}; assert(args); - r = bus_method_call_with_reply( - bus, + r = sd_bus_call_method( bus, "org.freedesktop.locale1", "/org/freedesktop/locale1", "org.freedesktop.DBus.Properties", "GetAll", + &error, &reply, - NULL, - DBUS_TYPE_STRING, &interface, - DBUS_TYPE_INVALID); - if (r < 0) + "s", ""); + if (r < 0) { + log_error("Could not get properties: %s", bus_error_message(&error, -r)); return r; - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || - dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY) { - log_error("Failed to parse reply."); - return -EIO; } - zero(info); - dbus_message_iter_recurse(&iter, &sub); + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "{sv}"); + if (r < 0) + goto fail; - while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { + while ((r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) { const char *name; + const char *contents; - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_DICT_ENTRY) { - log_error("Failed to parse reply."); - return -EIO; - } - - dbus_message_iter_recurse(&sub, &sub2); + r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_STRING, &name); + if (r < 0) + goto fail; - if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &name, true) < 0) { - log_error("Failed to parse reply."); - return -EIO; - } - - if (dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - return -EIO; - } + r = sd_bus_message_peek_type(reply, NULL, &contents); + if (r < 0) + goto fail; - dbus_message_iter_recurse(&sub2, &sub3); + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_VARIANT, contents); + if (r < 0) + goto fail; - r = status_property(name, &sub3, &info); + r = status_read_property(name, reply, &info); if (r < 0) { log_error("Failed to parse reply."); return r; } - dbus_message_iter_next(&sub); + r = sd_bus_message_exit_container(reply); + if (r < 0) + goto fail; + + r = sd_bus_message_exit_container(reply); + if (r < 0) + goto fail; } print_status_info(&info); + +fail: strv_free(info.locale); - return 0; + return r; } -static int set_locale(DBusConnection *bus, char **args, unsigned n) { - _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL; - dbus_bool_t interactive = true; - DBusError error; - DBusMessageIter iter; +static int set_locale(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; assert(bus); assert(args); - dbus_error_init(&error); - polkit_agent_open_if_enabled(); - m = dbus_message_new_method_call( + r = sd_bus_message_new_method_call(bus, "org.freedesktop.locale1", "/org/freedesktop/locale1", "org.freedesktop.locale1", - "SetLocale"); - if (!m) - return log_oom(); - - dbus_message_iter_init_append(m, &iter); + "SetLocale", &m); + if (r < 0) + return r; - r = bus_append_strv_iter(&iter, args + 1); + r = sd_bus_message_append_strv(m, args + 1); if (r < 0) - return log_oom(); + return r; - if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &interactive)) - return log_oom(); + r = sd_bus_message_append(m, "b", arg_ask_password); + if (r < 0) + return r; - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); - if (!reply) { - log_error("Failed to issue method call: %s", bus_error_message(&error)); - r = -EIO; - goto finish; + r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL); + if (r < 0) { + log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); + return r; } - r = 0; - -finish: - dbus_error_free(&error); - return r; + return 0; } static int add_locales_from_archive(Set *locales) { @@ -360,15 +358,17 @@ static int add_locales_from_archive(Set *locales) { if (e[i].locrec_offset == 0) continue; + if (!utf8_is_valid((char*) p + e[i].name_offset)) + continue; + z = strdup((char*) p + e[i].name_offset); if (!z) { r = log_oom(); goto finish; } - r = set_put(locales, z); + r = set_consume(locales, z); if (r < 0) { - free(z); log_error("Failed to add locale: %s", strerror(-r)); goto finish; } @@ -384,15 +384,14 @@ static int add_locales_from_archive(Set *locales) { } static int add_locales_from_libdir (Set *locales) { - DIR *dir; + _cleanup_closedir_ DIR *dir; struct dirent *entry; int r; dir = opendir("/usr/lib/locale"); if (!dir) { log_error("Failed to open locale directory: %m"); - r = -errno; - goto finish; + return -errno; } errno = 0; @@ -406,41 +405,29 @@ static int add_locales_from_libdir (Set *locales) { continue; z = strdup(entry->d_name); - if (!z) { - r = log_oom(); - goto finish; - } - - r = set_put(locales, z); - if (r < 0) { - free(z); + if (!z) + return log_oom(); - if (r != -EEXIST) { - log_error("Failed to add locale: %s", strerror(-r)); - goto finish; - } + r = set_consume(locales, z); + if (r < 0 && r != -EEXIST) { + log_error("Failed to add locale: %s", strerror(-r)); + return r; } errno = 0; } - if (errno != 0) { + if (errno > 0) { log_error("Failed to read locale directory: %m"); - r = -errno; - goto finish; + return -errno; } - r = 0; - - finish: - closedir(dir); - return r; + return 0; } -static int list_locales(DBusConnection *bus, char **args, unsigned n) { - Set *locales; +static int list_locales(sd_bus *bus, char **args, unsigned n) { + _cleanup_set_free_ Set *locales; _cleanup_strv_free_ char **l = NULL; - char **j; int r; locales = set_new(string_hash_func, string_compare_func); @@ -449,37 +436,30 @@ static int list_locales(DBusConnection *bus, char **args, unsigned n) { r = add_locales_from_archive(locales); if (r < 0 && r != -ENOENT) - goto finish; + return r; r = add_locales_from_libdir(locales); if (r < 0) - goto finish; + return r; l = set_get_strv(locales); - if (!l) { - r = log_oom(); - goto finish; - } + if (!l) + return log_oom(); strv_sort(l); pager_open_if_enabled(); - STRV_FOREACH(j, l) - puts(*j); - - r = 0; + strv_print(l); -finish: - set_free(locales); - - return r; + return 0; } -static int set_vconsole_keymap(DBusConnection *bus, char **args, unsigned n) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - dbus_bool_t interactive = true, b; +static int set_vconsole_keymap(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; const char *map, *toggle_map; + int r; assert(bus); assert(args); @@ -493,21 +473,20 @@ static int set_vconsole_keymap(DBusConnection *bus, char **args, unsigned n) { map = args[1]; toggle_map = n > 2 ? args[2] : ""; - b = arg_convert; - return bus_method_call_with_reply( + r = sd_bus_call_method( bus, "org.freedesktop.locale1", "/org/freedesktop/locale1", "org.freedesktop.locale1", "SetVConsoleKeyboard", - &reply, + &error, NULL, - DBUS_TYPE_STRING, &map, - DBUS_TYPE_STRING, &toggle_map, - DBUS_TYPE_BOOLEAN, &b, - DBUS_TYPE_BOOLEAN, &interactive, - DBUS_TYPE_INVALID); + "ssbb", map, toggle_map, arg_convert, arg_ask_password); + if (r < 0) + log_error("Failed to set keymap: %s", bus_error_message(&error, -r)); + + return r; } static Set *keymaps = NULL; @@ -540,26 +519,23 @@ static int nftw_cb( if (e) *e = 0; - r = set_put(keymaps, p); - if (r == -EEXIST) - free(p); - else if (r < 0) { + r = set_consume(keymaps, p); + if (r < 0 && r != -EEXIST) { log_error("Can't add keymap: %s", strerror(-r)); - free(p); return r; } return 0; } -static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) { - char _cleanup_strv_free_ **l = NULL; - char **i; +static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) { + _cleanup_strv_free_ char **l = NULL; keymaps = set_new(string_hash_func, string_compare_func); if (!keymaps) return log_oom(); + nftw("/usr/share/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); nftw("/usr/share/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); nftw("/usr/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); nftw("/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); @@ -581,17 +557,16 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) { pager_open_if_enabled(); - STRV_FOREACH(i, l) - puts(*i); - + strv_print(l); return 0; } -static int set_x11_keymap(DBusConnection *bus, char **args, unsigned n) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - dbus_bool_t interactive = true, b; +static int set_x11_keymap(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; const char *layout, *model, *variant, *options; + int r; assert(bus); assert(args); @@ -607,43 +582,150 @@ static int set_x11_keymap(DBusConnection *bus, char **args, unsigned n) { model = n > 2 ? args[2] : ""; variant = n > 3 ? args[3] : ""; options = n > 4 ? args[4] : ""; - b = arg_convert; - return bus_method_call_with_reply( + r = sd_bus_call_method( bus, "org.freedesktop.locale1", "/org/freedesktop/locale1", "org.freedesktop.locale1", "SetX11Keyboard", - &reply, + &error, NULL, - DBUS_TYPE_STRING, &layout, - DBUS_TYPE_STRING, &model, - DBUS_TYPE_STRING, &variant, - DBUS_TYPE_STRING, &options, - DBUS_TYPE_BOOLEAN, &b, - DBUS_TYPE_BOOLEAN, &interactive, - DBUS_TYPE_INVALID); + "ssssbb", layout, model, variant, options, + arg_convert, arg_ask_password); + if (r < 0) + log_error("Failed to set keymap: %s", bus_error_message(&error, -r)); + + return r; +} + +static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) { + _cleanup_fclose_ FILE *f = NULL; + _cleanup_strv_free_ char **list = NULL; + char line[LINE_MAX]; + enum { + NONE, + MODELS, + LAYOUTS, + VARIANTS, + OPTIONS + } state = NONE, look_for; + int r; + + if (n > 2) { + log_error("Too many arguments."); + return -EINVAL; + } + + f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); + if (!f) { + log_error("Failed to open keyboard mapping list. %m"); + return -errno; + } + + if (streq(args[0], "list-x11-keymap-models")) + look_for = MODELS; + else if (streq(args[0], "list-x11-keymap-layouts")) + look_for = LAYOUTS; + else if (streq(args[0], "list-x11-keymap-variants")) + look_for = VARIANTS; + else if (streq(args[0], "list-x11-keymap-options")) + look_for = OPTIONS; + else + assert_not_reached("Wrong parameter"); + + FOREACH_LINE(line, f, break) { + char *l, *w; + + l = strstrip(line); + + if (isempty(l)) + continue; + + if (l[0] == '!') { + if (startswith(l, "! model")) + state = MODELS; + else if (startswith(l, "! layout")) + state = LAYOUTS; + else if (startswith(l, "! variant")) + state = VARIANTS; + else if (startswith(l, "! option")) + state = OPTIONS; + else + state = NONE; + + continue; + } + + if (state != look_for) + continue; + + w = l + strcspn(l, WHITESPACE); + + if (n > 1) { + char *e; + + if (*w == 0) + continue; + + *w = 0; + w++; + w += strspn(w, WHITESPACE); + + e = strchr(w, ':'); + if (!e) + continue; + + *e = 0; + + if (!streq(w, args[1])) + continue; + } else + *w = 0; + + r = strv_extend(&list, l); + if (r < 0) + return log_oom(); + } + + if (strv_isempty(list)) { + log_error("Couldn't find any entries."); + return -ENOENT; + } + + strv_sort(list); + strv_uniq(list); + + pager_open_if_enabled(); + + strv_print(list); + return 0; } 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" - " --no-convert Don't convert keyboard mappings\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\n" + "Query or change system locale and keyboard settings.\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --no-convert Don't convert keyboard mappings\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" "Commands:\n" - " status Show current locale settings\n" - " set-locale LOCALE... Set system locale\n" - " list-locales Show known locales\n" - " set-keymap MAP [MAP] Set virtual console keyboard mapping\n" - " list-keymaps Show known virtual console keyboard mappings\n" + " status Show current locale settings\n" + " set-locale LOCALE... Set system locale\n" + " list-locales Show known locales\n" + " set-keymap MAP [MAP] Set virtual console keyboard mapping\n" + " list-keymaps Show known virtual console keyboard mappings\n" " set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]\n" - " Set X11 keyboard mapping\n", + " Set X11 keyboard mapping\n" + " list-x11-keymap-models Show known X11 keyboard mapping models\n" + " list-x11-keymap-layouts Show known X11 keyboard mapping layouts\n" + " list-x11-keymap-variants [LAYOUT]\n" + " Show known X11 keyboard mapping variants\n" + " list-x11-keymap-options Show known X11 keyboard mapping options\n", program_invocation_short_name); return 0; @@ -659,14 +741,14 @@ static int parse_argv(int argc, char *argv[]) { }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "no-pager", no_argument, NULL, ARG_NO_PAGER }, - { "host", required_argument, NULL, 'H' }, - { "privileged", no_argument, NULL, 'P' }, - { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, - { "no-convert", no_argument, NULL, ARG_NO_CONVERT }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "no-pager", no_argument, NULL, ARG_NO_PAGER }, + { "host", required_argument, NULL, 'H' }, + { "machine", required_argument, NULL, 'M' }, + { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, + { "no-convert", no_argument, NULL, ARG_NO_CONVERT }, + { NULL, 0, NULL, 0 } }; int c; @@ -674,7 +756,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "has:H:P", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) { switch (c) { @@ -687,15 +769,6 @@ static int parse_argv(int argc, char *argv[]) { puts(SYSTEMD_FEATURES); return 0; - case 'P': - arg_transport = TRANSPORT_POLKIT; - break; - - case 'H': - arg_transport = TRANSPORT_SSH; - arg_host = optarg; - break; - case ARG_NO_CONVERT: arg_convert = false; break; @@ -704,6 +777,20 @@ static int parse_argv(int argc, char *argv[]) { arg_no_pager = true; break; + case ARG_NO_ASK_PASSWORD: + arg_ask_password = false; + break; + + case 'H': + arg_transport = BUS_TRANSPORT_REMOTE; + arg_host = optarg; + break; + + case 'M': + arg_transport = BUS_TRANSPORT_CONTAINER; + arg_host = optarg; + break; + case '?': return -EINVAL; @@ -716,7 +803,7 @@ static int parse_argv(int argc, char *argv[]) { return 1; } -static int localectl_main(DBusConnection *bus, int argc, char *argv[], DBusError *error) { +static int localectl_main(sd_bus *bus, int argc, char *argv[]) { static const struct { const char* verb; @@ -726,14 +813,18 @@ static int localectl_main(DBusConnection *bus, int argc, char *argv[], DBusError EQUAL } argc_cmp; const int argc; - int (* const dispatch)(DBusConnection *bus, char **args, unsigned n); + int (* const dispatch)(sd_bus *bus, char **args, unsigned n); } verbs[] = { - { "status", LESS, 1, show_status }, - { "set-locale", MORE, 2, set_locale }, - { "list-locales", EQUAL, 1, list_locales }, - { "set-keymap", MORE, 2, set_vconsole_keymap }, - { "list-keymaps", EQUAL, 1, list_vconsole_keymaps }, - { "set-x11-keymap", MORE, 2, set_x11_keymap }, + { "status", LESS, 1, show_status }, + { "set-locale", MORE, 2, set_locale }, + { "list-locales", EQUAL, 1, list_locales }, + { "set-keymap", MORE, 2, set_vconsole_keymap }, + { "list-keymaps", EQUAL, 1, list_vconsole_keymaps }, + { "set-x11-keymap", MORE, 2, set_x11_keymap }, + { "list-x11-keymap-models", EQUAL, 1, list_x11_keymaps }, + { "list-x11-keymap-layouts", EQUAL, 1, list_x11_keymaps }, + { "list-x11-keymap-variants", LESS, 2, list_x11_keymaps }, + { "list-x11-keymap-options", EQUAL, 1, list_x11_keymaps }, }; int left; @@ -741,7 +832,6 @@ static int localectl_main(DBusConnection *bus, int argc, char *argv[], DBusError assert(argc >= 0); assert(argv); - assert(error); left = argc - optind; @@ -794,20 +884,12 @@ static int localectl_main(DBusConnection *bus, int argc, char *argv[], DBusError assert_not_reached("Unknown comparison operator."); } - if (!bus) { - log_error("Failed to get D-Bus connection: %s", error->message); - return -EIO; - } - return verbs[i].dispatch(bus, argv + optind, left); } -int main(int argc, char *argv[]) { - int r, retval = EXIT_FAILURE; - DBusConnection *bus = NULL; - DBusError error; - - dbus_error_init(&error); +int main(int argc, char*argv[]) { + int r, ret = EXIT_FAILURE; + _cleanup_bus_unref_ sd_bus *bus = NULL; setlocale(LC_ALL, ""); log_parse_environment(); @@ -817,33 +899,22 @@ int main(int argc, char *argv[]) { if (r < 0) goto finish; else if (r == 0) { - retval = EXIT_SUCCESS; + ret = EXIT_SUCCESS; goto finish; } - if (arg_transport == TRANSPORT_NORMAL) - bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); - else if (arg_transport == TRANSPORT_POLKIT) - bus_connect_system_polkit(&bus, &error); - else if (arg_transport == TRANSPORT_SSH) - bus_connect_system_ssh(NULL, arg_host, &bus, &error); - else - assert_not_reached("Uh, invalid transport..."); - - r = localectl_main(bus, argc, argv, &error); - retval = r < 0 ? EXIT_FAILURE : r; - -finish: - if (bus) { - dbus_connection_flush(bus); - dbus_connection_close(bus); - dbus_connection_unref(bus); + 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; } - dbus_error_free(&error); - dbus_shutdown(); + r = localectl_main(bus, argc, argv); + ret = r < 0 ? EXIT_FAILURE : r; +finish: pager_close(); - return retval; + return ret; }