X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocalectl.c;h=515fca540aa3a3f465624c1b57854728c96d9875;hp=31deb674dceca55a4f9344016ea16d0eeb2bac22;hb=e3b3286f2220835c297504af1eafe1801972d30b;hpb=a86a47ce1f63476631635fbcbc10af8877172114 diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 31deb674d..515fca540 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -23,25 +23,23 @@ #include #include #include -#include #include #include #include -#include -#include #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" #include "strv.h" #include "pager.h" #include "set.h" -#include "path-util.h" -#include "utf8.h" +#include "def.h" +#include "virt.h" +#include "fileio.h" +#include "locale-util.h" static bool arg_no_pager = false; static bool arg_ask_password = true; @@ -79,6 +77,52 @@ typedef struct StatusInfo { const char *x11_options; } StatusInfo; +static void print_overriden_variables(void) { + int r; + char *variables[_VARIABLE_LC_MAX] = {}; + LocaleVariable j; + bool print_warning = true; + + if (detect_container(NULL) > 0 || arg_host) + return; + + r = parse_env_file("/proc/cmdline", WHITESPACE, + "locale.LANG", &variables[VARIABLE_LANG], + "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], + "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], + "locale.LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC], + "locale.LC_TIME", &variables[VARIABLE_LC_TIME], + "locale.LC_COLLATE", &variables[VARIABLE_LC_COLLATE], + "locale.LC_MONETARY", &variables[VARIABLE_LC_MONETARY], + "locale.LC_MESSAGES", &variables[VARIABLE_LC_MESSAGES], + "locale.LC_PAPER", &variables[VARIABLE_LC_PAPER], + "locale.LC_NAME", &variables[VARIABLE_LC_NAME], + "locale.LC_ADDRESS", &variables[VARIABLE_LC_ADDRESS], + "locale.LC_TELEPHONE", &variables[VARIABLE_LC_TELEPHONE], + "locale.LC_MEASUREMENT", &variables[VARIABLE_LC_MEASUREMENT], + "locale.LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION], + NULL); + + if (r < 0 && r != -ENOENT) { + log_warning_errno(r, "Failed to read /proc/cmdline: %m"); + goto finish; + } + + for (j = 0; j < _VARIABLE_LC_MAX; j++) + if (variables[j]) { + if (print_warning) { + log_warning("Warning: Settings on kernel command line override system locale settings in /etc/locale.conf.\n" + " Command Line: %s=%s", locale_variable_to_string(j), variables[j]); + + print_warning = false; + } else + log_warning(" %s=%s", locale_variable_to_string(j), variables[j]); + } + finish: + for (j = 0; j < _VARIABLE_LC_MAX; j++) + free(variables[j]); +} + static void print_status_info(StatusInfo *i) { assert(i); @@ -127,9 +171,12 @@ static int show_status(sd_bus *bus, char **args, unsigned n) { "/org/freedesktop/locale1", map, &info); - if (r < 0) + if (r < 0) { + log_error_errno(r, "Could not get properties: %m"); goto fail; + } + print_overriden_variables(); print_status_info(&info); fail: @@ -139,7 +186,6 @@ fail: 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; @@ -148,23 +194,25 @@ static int set_locale(sd_bus *bus, char **args, unsigned n) { polkit_agent_open_if_enabled(); - r = sd_bus_message_new_method_call(bus, + r = sd_bus_message_new_method_call( + bus, + &m, "org.freedesktop.locale1", "/org/freedesktop/locale1", "org.freedesktop.locale1", - "SetLocale", &m); + "SetLocale"); if (r < 0) - return r; + return bus_log_create_error(r); r = sd_bus_message_append_strv(m, args + 1); if (r < 0) - return r; + return bus_log_create_error(r); r = sd_bus_message_append(m, "b", arg_ask_password); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL); + r = sd_bus_call(bus, m, 0, &error, NULL); if (r < 0) { log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); return r; @@ -173,199 +221,23 @@ static int set_locale(sd_bus *bus, char **args, unsigned n) { return 0; } -static int add_locales_from_archive(Set *locales) { - /* Stolen from glibc... */ - - struct locarhead { - uint32_t magic; - /* Serial number. */ - uint32_t serial; - /* Name hash table. */ - uint32_t namehash_offset; - uint32_t namehash_used; - uint32_t namehash_size; - /* String table. */ - uint32_t string_offset; - uint32_t string_used; - uint32_t string_size; - /* Table with locale records. */ - uint32_t locrectab_offset; - uint32_t locrectab_used; - uint32_t locrectab_size; - /* MD5 sum hash table. */ - uint32_t sumhash_offset; - uint32_t sumhash_used; - uint32_t sumhash_size; - }; - - struct namehashent { - /* Hash value of the name. */ - uint32_t hashval; - /* Offset of the name in the string table. */ - uint32_t name_offset; - /* Offset of the locale record. */ - uint32_t locrec_offset; - }; - - const struct locarhead *h; - const struct namehashent *e; - const void *p = MAP_FAILED; - _cleanup_close_ int fd = -1; - size_t sz = 0; - struct stat st; - unsigned i; - int r; - - fd = open("/usr/lib/locale/locale-archive", O_RDONLY|O_NOCTTY|O_CLOEXEC); - if (fd < 0) { - if (errno != ENOENT) - log_error("Failed to open locale archive: %m"); - r = -errno; - goto finish; - } - - if (fstat(fd, &st) < 0) { - log_error("fstat() failed: %m"); - r = -errno; - goto finish; - } - - if (!S_ISREG(st.st_mode)) { - log_error("Archive file is not regular"); - r = -EBADMSG; - goto finish; - } - - if (st.st_size < (off_t) sizeof(struct locarhead)) { - log_error("Archive has invalid size"); - r = -EBADMSG; - goto finish; - } - - p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (p == MAP_FAILED) { - log_error("Failed to map archive: %m"); - r = -errno; - goto finish; - } - - h = (const struct locarhead *) p; - if (h->magic != 0xde020109 || - h->namehash_offset + h->namehash_size > st.st_size || - h->string_offset + h->string_size > st.st_size || - h->locrectab_offset + h->locrectab_size > st.st_size || - h->sumhash_offset + h->sumhash_size > st.st_size) { - log_error("Invalid archive file."); - r = -EBADMSG; - goto finish; - } - - e = (const struct namehashent*) ((const uint8_t*) p + h->namehash_offset); - for (i = 0; i < h->namehash_size; i++) { - char *z; - - 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_consume(locales, z); - if (r < 0) { - log_error("Failed to add locale: %s", strerror(-r)); - goto finish; - } - } - - r = 0; - - finish: - if (p != MAP_FAILED) - munmap((void*) p, sz); - - return r; -} - -static int add_locales_from_libdir (Set *locales) { - _cleanup_closedir_ DIR *dir; - struct dirent *entry; - int r; - - dir = opendir("/usr/lib/locale"); - if (!dir) { - log_error("Failed to open locale directory: %m"); - return -errno; - } - - errno = 0; - while ((entry = readdir(dir))) { - char *z; - - if (entry->d_type != DT_DIR) - continue; - - if (ignore_file(entry->d_name)) - continue; - - z = strdup(entry->d_name); - if (!z) - return log_oom(); - - 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) { - log_error("Failed to read locale directory: %m"); - return -errno; - } - - return 0; -} - static int list_locales(sd_bus *bus, char **args, unsigned n) { - _cleanup_set_free_ Set *locales; _cleanup_strv_free_ char **l = NULL; int r; - locales = set_new(string_hash_func, string_compare_func); - if (!locales) - return log_oom(); - - r = add_locales_from_archive(locales); - if (r < 0 && r != -ENOENT) - return r; + assert(args); - r = add_locales_from_libdir(locales); + r = get_locales(&l); if (r < 0) - return r; - - l = set_get_strv(locales); - if (!l) - return log_oom(); - - strv_sort(l); + return log_error_errno(r, "Failed to read list of locales: %m"); pager_open_if_enabled(); - strv_print(l); return 0; } 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; @@ -416,7 +288,7 @@ static int nftw_cb( !endswith(fpath, ".map.gz")) return 0; - p = strdup(path_get_file_name(fpath)); + p = strdup(basename(fpath)); if (!p) return log_oom(); @@ -429,25 +301,22 @@ static int nftw_cb( *e = 0; r = set_consume(keymaps, p); - if (r < 0 && r != -EEXIST) { - log_error("Can't add keymap: %s", strerror(-r)); - return r; - } + if (r < 0 && r != -EEXIST) + return log_error_errno(r, "Can't add keymap: %m"); return 0; } static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) { _cleanup_strv_free_ char **l = NULL; + const char *dir; - keymaps = set_new(string_hash_func, string_compare_func); + keymaps = set_new(&string_hash_ops); 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); + NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) + nftw(dir, nftw_cb, 20, FTW_MOUNT|FTW_PHYS); l = set_get_strv(keymaps); if (!l) { @@ -472,7 +341,6 @@ static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) { } 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; @@ -527,10 +395,8 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) { } f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); - if (!f) { - log_error("Failed to open keyboard mapping list. %m"); - return -errno; - } + if (!f) + return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); if (streq(args[0], "list-x11-keymap-models")) look_for = MODELS; @@ -611,8 +477,7 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) { return 0; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] COMMAND ...\n\n" "Query or change system locale and keyboard settings.\n\n" " -h --help Show this help\n" @@ -626,18 +491,16 @@ static int help(void) { " 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" + " set-keymap MAP [MAP] Set console and X11 keyboard mappings\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-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]\n" + " Set X11 and console keyboard mappings\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; + " list-x11-keymap-options Show known X11 keyboard mapping options\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -665,12 +528,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -695,7 +559,7 @@ static int parse_argv(int argc, char *argv[]) { break; case 'M': - arg_transport = BUS_TRANSPORT_CONTAINER; + arg_transport = BUS_TRANSPORT_MACHINE; arg_host = optarg; break; @@ -705,7 +569,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; } @@ -795,7 +658,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) { } int main(int argc, char*argv[]) { - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; setlocale(LC_ALL, ""); @@ -808,7 +671,7 @@ int main(int argc, char*argv[]) { r = bus_open_transport(arg_transport, arg_host, false, &bus); if (r < 0) { - log_error("Failed to create bus connection: %s", strerror(-r)); + log_error_errno(r, "Failed to create bus connection: %m"); goto finish; }