summaryrefslogtreecommitdiff
path: root/src/locale
diff options
context:
space:
mode:
Diffstat (limited to 'src/locale')
-rw-r--r--src/locale/.gitignore1
l---------src/locale/Makefile1
-rw-r--r--src/locale/kbd-model-map68
-rw-r--r--src/locale/keymap-util.c724
-rw-r--r--src/locale/keymap-util.h46
-rw-r--r--src/locale/language-fallback-map13
-rw-r--r--src/locale/localectl.c683
-rw-r--r--src/locale/localed.c710
-rw-r--r--src/locale/org.freedesktop.locale1.conf27
-rw-r--r--src/locale/org.freedesktop.locale1.policy.in40
-rw-r--r--src/locale/org.freedesktop.locale1.service12
-rw-r--r--src/locale/test-keymap-util.c220
12 files changed, 0 insertions, 2545 deletions
diff --git a/src/locale/.gitignore b/src/locale/.gitignore
deleted file mode 100644
index b1e0ba755e..0000000000
--- a/src/locale/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-org.freedesktop.locale1.policy
diff --git a/src/locale/Makefile b/src/locale/Makefile
deleted file mode 120000
index d0b0e8e008..0000000000
--- a/src/locale/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile \ No newline at end of file
diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
deleted file mode 100644
index 8fa984f83b..0000000000
--- a/src/locale/kbd-model-map
+++ /dev/null
@@ -1,68 +0,0 @@
-# Generated from system-config-keyboard's model list
-# consolelayout xlayout xmodel xvariant xoptions
-sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
-nl nl pc105 - terminate:ctrl_alt_bksp
-mk-utf mk,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-trq tr pc105 - terminate:ctrl_alt_bksp
-uk gb pc105 - terminate:ctrl_alt_bksp
-is-latin1 is pc105 - terminate:ctrl_alt_bksp
-de de pc105 - terminate:ctrl_alt_bksp
-la-latin1 latam pc105 - terminate:ctrl_alt_bksp
-us us pc105+inet - terminate:ctrl_alt_bksp
-ko kr pc105 - terminate:ctrl_alt_bksp
-ro-std ro pc105 std terminate:ctrl_alt_bksp
-de-latin1 de pc105 - terminate:ctrl_alt_bksp
-slovene si pc105 - terminate:ctrl_alt_bksp
-hu101 hu pc105 qwerty terminate:ctrl_alt_bksp
-jp106 jp jp106 - terminate:ctrl_alt_bksp
-croat hr pc105 - terminate:ctrl_alt_bksp
-it2 it pc105 - terminate:ctrl_alt_bksp
-hu hu pc105 - terminate:ctrl_alt_bksp
-sr-latin rs pc105 latin terminate:ctrl_alt_bksp
-fi fi pc105 - terminate:ctrl_alt_bksp
-fr_CH ch pc105 fr terminate:ctrl_alt_bksp
-dk-latin1 dk pc105 - terminate:ctrl_alt_bksp
-fr fr pc105 - terminate:ctrl_alt_bksp
-it it pc105 - terminate:ctrl_alt_bksp
-ua-utf ua,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-fr-latin1 fr pc105 - terminate:ctrl_alt_bksp
-sg-latin1 ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
-be-latin1 be pc105 - terminate:ctrl_alt_bksp
-dk dk pc105 - terminate:ctrl_alt_bksp
-fr-pc fr pc105 - terminate:ctrl_alt_bksp
-bg_pho-utf8 bg,us pc105 ,phonetic terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-it-ibm it pc105 - terminate:ctrl_alt_bksp
-cz-us-qwertz cz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-br-abnt2 br abnt2 - terminate:ctrl_alt_bksp
-ro ro pc105 - terminate:ctrl_alt_bksp
-us-acentos us pc105 intl terminate:ctrl_alt_bksp
-pt-latin1 pt pc105 - terminate:ctrl_alt_bksp
-ro-std-cedilla ro pc105 std_cedilla terminate:ctrl_alt_bksp
-tj_alt-UTF8 tj pc105 - terminate:ctrl_alt_bksp
-de-latin1-nodeadkeys de pc105 nodeadkeys terminate:ctrl_alt_bksp
-no no pc105 - terminate:ctrl_alt_bksp
-bg_bds-utf8 bg,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-dvorak us pc105 dvorak terminate:ctrl_alt_bksp
-dvorak us pc105 dvorak-alt-intl terminate:ctrl_alt_bksp
-ru ru,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-cz-lat2 cz pc105 qwerty terminate:ctrl_alt_bksp
-pl2 pl pc105 - terminate:ctrl_alt_bksp
-es es pc105 - terminate:ctrl_alt_bksp
-ro-cedilla ro pc105 cedilla terminate:ctrl_alt_bksp
-ie ie pc105 - terminate:ctrl_alt_bksp
-et ee pc105 - terminate:ctrl_alt_bksp
-sk-qwerty sk pc105 - terminate:ctrl_alt_bksp,qwerty
-sk-qwertz sk pc105 - terminate:ctrl_alt_bksp
-fr-latin9 fr pc105 latin9 terminate:ctrl_alt_bksp
-fr_CH-latin1 ch pc105 fr terminate:ctrl_alt_bksp
-cf ca pc105 - terminate:ctrl_alt_bksp
-sv-latin1 se pc105 - terminate:ctrl_alt_bksp
-sr-cy rs pc105 - terminate:ctrl_alt_bksp
-gr gr,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-il il pc105 - terminate:ctrl_alt_bksp
-kazakh kz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-lt.baltic lt pc105 - terminate:ctrl_alt_bksp
-lt.l4 lt pc105 - terminate:ctrl_alt_bksp
-lt lt pc105 - terminate:ctrl_alt_bksp
-khmer kh,us pc105 - terminate:ctrl_alt_bksp
diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
deleted file mode 100644
index a6bcd1ad54..0000000000
--- a/src/locale/keymap-util.c
+++ /dev/null
@@ -1,724 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2011 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "def.h"
-#include "env-util.h"
-#include "fd-util.h"
-#include "fileio-label.h"
-#include "fileio.h"
-#include "keymap-util.h"
-#include "locale-util.h"
-#include "macro.h"
-#include "mkdir.h"
-#include "string-util.h"
-#include "strv.h"
-
-static bool startswith_comma(const char *s, const char *prefix) {
- s = startswith(s, prefix);
- if (!s)
- return false;
-
- return *s == ',' || *s == '\0';
-}
-
-static const char* strnulldash(const char *s) {
- return isempty(s) || streq(s, "-") ? NULL : s;
-}
-
-static const char* systemd_kbd_model_map(void) {
- const char* s;
-
- s = getenv("SYSTEMD_KBD_MODEL_MAP");
- if (s)
- return s;
-
- return SYSTEMD_KBD_MODEL_MAP;
-}
-
-static const char* systemd_language_fallback_map(void) {
- const char* s;
-
- s = getenv("SYSTEMD_LANGUAGE_FALLBACK_MAP");
- if (s)
- return s;
-
- return SYSTEMD_LANGUAGE_FALLBACK_MAP;
-}
-
-static void context_free_x11(Context *c) {
- c->x11_layout = mfree(c->x11_layout);
- c->x11_options = mfree(c->x11_options);
- c->x11_model = mfree(c->x11_model);
- c->x11_variant = mfree(c->x11_variant);
-}
-
-static void context_free_vconsole(Context *c) {
- c->vc_keymap = mfree(c->vc_keymap);
- c->vc_keymap_toggle = mfree(c->vc_keymap_toggle);
-}
-
-static void context_free_locale(Context *c) {
- int p;
-
- for (p = 0; p < _VARIABLE_LC_MAX; p++)
- c->locale[p] = mfree(c->locale[p]);
-}
-
-void context_free(Context *c) {
- context_free_locale(c);
- context_free_x11(c);
- context_free_vconsole(c);
-};
-
-void locale_simplify(Context *c) {
- int p;
-
- for (p = VARIABLE_LANG+1; p < _VARIABLE_LC_MAX; p++)
- if (isempty(c->locale[p]) || streq_ptr(c->locale[VARIABLE_LANG], c->locale[p]))
- c->locale[p] = mfree(c->locale[p]);
-}
-
-static int locale_read_data(Context *c) {
- int r;
-
- context_free_locale(c);
-
- r = parse_env_file("/etc/locale.conf", NEWLINE,
- "LANG", &c->locale[VARIABLE_LANG],
- "LANGUAGE", &c->locale[VARIABLE_LANGUAGE],
- "LC_CTYPE", &c->locale[VARIABLE_LC_CTYPE],
- "LC_NUMERIC", &c->locale[VARIABLE_LC_NUMERIC],
- "LC_TIME", &c->locale[VARIABLE_LC_TIME],
- "LC_COLLATE", &c->locale[VARIABLE_LC_COLLATE],
- "LC_MONETARY", &c->locale[VARIABLE_LC_MONETARY],
- "LC_MESSAGES", &c->locale[VARIABLE_LC_MESSAGES],
- "LC_PAPER", &c->locale[VARIABLE_LC_PAPER],
- "LC_NAME", &c->locale[VARIABLE_LC_NAME],
- "LC_ADDRESS", &c->locale[VARIABLE_LC_ADDRESS],
- "LC_TELEPHONE", &c->locale[VARIABLE_LC_TELEPHONE],
- "LC_MEASUREMENT", &c->locale[VARIABLE_LC_MEASUREMENT],
- "LC_IDENTIFICATION", &c->locale[VARIABLE_LC_IDENTIFICATION],
- NULL);
-
- if (r == -ENOENT) {
- int p;
-
- /* Fill in what we got passed from systemd. */
- for (p = 0; p < _VARIABLE_LC_MAX; p++) {
- const char *name;
-
- name = locale_variable_to_string(p);
- assert(name);
-
- r = free_and_strdup(&c->locale[p], empty_to_null(getenv(name)));
- if (r < 0)
- return r;
- }
-
- r = 0;
- }
-
- locale_simplify(c);
- return r;
-}
-
-static int vconsole_read_data(Context *c) {
- int r;
-
- context_free_vconsole(c);
-
- r = parse_env_file("/etc/vconsole.conf", NEWLINE,
- "KEYMAP", &c->vc_keymap,
- "KEYMAP_TOGGLE", &c->vc_keymap_toggle,
- NULL);
-
- if (r < 0 && r != -ENOENT)
- return r;
-
- return 0;
-}
-
-static int x11_read_data(Context *c) {
- _cleanup_fclose_ FILE *f;
- char line[LINE_MAX];
- bool in_section = false;
- int r;
-
- context_free_x11(c);
-
- f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re");
- if (!f)
- return errno == ENOENT ? 0 : -errno;
-
- while (fgets(line, sizeof(line), f)) {
- char *l;
-
- char_array_0(line);
- l = strstrip(line);
-
- if (l[0] == 0 || l[0] == '#')
- continue;
-
- if (in_section && first_word(l, "Option")) {
- _cleanup_strv_free_ char **a = NULL;
-
- r = strv_split_extract(&a, l, WHITESPACE, EXTRACT_QUOTES);
- if (r < 0)
- return r;
-
- if (strv_length(a) == 3) {
- char **p = NULL;
-
- if (streq(a[1], "XkbLayout"))
- p = &c->x11_layout;
- else if (streq(a[1], "XkbModel"))
- p = &c->x11_model;
- else if (streq(a[1], "XkbVariant"))
- p = &c->x11_variant;
- else if (streq(a[1], "XkbOptions"))
- p = &c->x11_options;
-
- if (p) {
- free(*p);
- *p = a[2];
- a[2] = NULL;
- }
- }
-
- } else if (!in_section && first_word(l, "Section")) {
- _cleanup_strv_free_ char **a = NULL;
-
- r = strv_split_extract(&a, l, WHITESPACE, EXTRACT_QUOTES);
- if (r < 0)
- return -ENOMEM;
-
- if (strv_length(a) == 2 && streq(a[1], "InputClass"))
- in_section = true;
-
- } else if (in_section && first_word(l, "EndSection"))
- in_section = false;
- }
-
- return 0;
-}
-
-int context_read_data(Context *c) {
- int r, q, p;
-
- r = locale_read_data(c);
- q = vconsole_read_data(c);
- p = x11_read_data(c);
-
- return r < 0 ? r : q < 0 ? q : p;
-}
-
-int locale_write_data(Context *c, char ***settings) {
- int r, p;
- _cleanup_strv_free_ char **l = NULL;
-
- /* Set values will be returned as strv in *settings on success. */
-
- r = load_env_file(NULL, "/etc/locale.conf", NULL, &l);
- if (r < 0 && r != -ENOENT)
- return r;
-
- for (p = 0; p < _VARIABLE_LC_MAX; p++) {
- _cleanup_free_ char *t = NULL;
- char **u;
- const char *name;
-
- name = locale_variable_to_string(p);
- assert(name);
-
- if (isempty(c->locale[p])) {
- l = strv_env_unset(l, name);
- continue;
- }
-
- if (asprintf(&t, "%s=%s", name, c->locale[p]) < 0)
- return -ENOMEM;
-
- u = strv_env_set(l, t);
- if (!u)
- return -ENOMEM;
-
- strv_free(l);
- l = u;
- }
-
- if (strv_isempty(l)) {
- if (unlink("/etc/locale.conf") < 0)
- return errno == ENOENT ? 0 : -errno;
-
- return 0;
- }
-
- r = write_env_file_label("/etc/locale.conf", l);
- if (r < 0)
- return r;
-
- *settings = l;
- l = NULL;
- return 0;
-}
-
-int vconsole_write_data(Context *c) {
- int r;
- _cleanup_strv_free_ char **l = NULL;
-
- r = load_env_file(NULL, "/etc/vconsole.conf", NULL, &l);
- if (r < 0 && r != -ENOENT)
- return r;
-
- if (isempty(c->vc_keymap))
- l = strv_env_unset(l, "KEYMAP");
- else {
- _cleanup_free_ char *s = NULL;
- char **u;
-
- s = strappend("KEYMAP=", c->vc_keymap);
- if (!s)
- return -ENOMEM;
-
- u = strv_env_set(l, s);
- if (!u)
- return -ENOMEM;
-
- strv_free(l);
- l = u;
- }
-
- if (isempty(c->vc_keymap_toggle))
- l = strv_env_unset(l, "KEYMAP_TOGGLE");
- else {
- _cleanup_free_ char *s = NULL;
- char **u;
-
- s = strappend("KEYMAP_TOGGLE=", c->vc_keymap_toggle);
- if (!s)
- return -ENOMEM;
-
- u = strv_env_set(l, s);
- if (!u)
- return -ENOMEM;
-
- strv_free(l);
- l = u;
- }
-
- if (strv_isempty(l)) {
- if (unlink("/etc/vconsole.conf") < 0)
- return errno == ENOENT ? 0 : -errno;
-
- return 0;
- }
-
- return write_env_file_label("/etc/vconsole.conf", l);
-}
-
-int x11_write_data(Context *c) {
- _cleanup_fclose_ FILE *f = NULL;
- _cleanup_free_ char *temp_path = NULL;
- int r;
-
- if (isempty(c->x11_layout) &&
- isempty(c->x11_model) &&
- isempty(c->x11_variant) &&
- isempty(c->x11_options)) {
-
- if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
- return errno == ENOENT ? 0 : -errno;
-
- return 0;
- }
-
- mkdir_p_label("/etc/X11/xorg.conf.d", 0755);
-
- r = fopen_temporary("/etc/X11/xorg.conf.d/00-keyboard.conf", &f, &temp_path);
- if (r < 0)
- return r;
-
- fchmod(fileno(f), 0644);
-
- fputs("# Read and parsed by systemd-localed. It's probably wise not to edit this file\n"
- "# manually too freely.\n"
- "Section \"InputClass\"\n"
- " Identifier \"system-keyboard\"\n"
- " MatchIsKeyboard \"on\"\n", f);
-
- if (!isempty(c->x11_layout))
- fprintf(f, " Option \"XkbLayout\" \"%s\"\n", c->x11_layout);
-
- if (!isempty(c->x11_model))
- fprintf(f, " Option \"XkbModel\" \"%s\"\n", c->x11_model);
-
- if (!isempty(c->x11_variant))
- fprintf(f, " Option \"XkbVariant\" \"%s\"\n", c->x11_variant);
-
- if (!isempty(c->x11_options))
- fprintf(f, " Option \"XkbOptions\" \"%s\"\n", c->x11_options);
-
- fputs("EndSection\n", f);
-
- r = fflush_and_check(f);
- if (r < 0)
- goto fail;
-
- if (rename(temp_path, "/etc/X11/xorg.conf.d/00-keyboard.conf") < 0) {
- r = -errno;
- goto fail;
- }
-
- return 0;
-
-fail:
- (void) unlink("/etc/X11/xorg.conf.d/00-keyboard.conf");
-
- if (temp_path)
- (void) unlink(temp_path);
-
- return r;
-}
-
-static int read_next_mapping(const char* filename,
- unsigned min_fields, unsigned max_fields,
- FILE *f, unsigned *n, char ***a) {
- assert(f);
- assert(n);
- assert(a);
-
- for (;;) {
- char line[LINE_MAX];
- char *l, **b;
- int r;
- size_t length;
-
- errno = 0;
- if (!fgets(line, sizeof(line), f)) {
-
- if (ferror(f))
- return errno > 0 ? -errno : -EIO;
-
- return 0;
- }
-
- (*n)++;
-
- l = strstrip(line);
- if (l[0] == 0 || l[0] == '#')
- continue;
-
- r = strv_split_extract(&b, l, WHITESPACE, EXTRACT_QUOTES);
- if (r < 0)
- return r;
-
- length = strv_length(b);
- if (length < min_fields || length > max_fields) {
- log_error("Invalid line %s:%u, ignoring.", filename, *n);
- strv_free(b);
- continue;
-
- }
-
- *a = b;
- return 1;
- }
-}
-
-int vconsole_convert_to_x11(Context *c) {
- const char *map;
- int modified = -1;
-
- map = systemd_kbd_model_map();
-
- if (isempty(c->vc_keymap)) {
- modified =
- !isempty(c->x11_layout) ||
- !isempty(c->x11_model) ||
- !isempty(c->x11_variant) ||
- !isempty(c->x11_options);
-
- context_free_x11(c);
- } else {
- _cleanup_fclose_ FILE *f = NULL;
- unsigned n = 0;
-
- f = fopen(map, "re");
- if (!f)
- return -errno;
-
- for (;;) {
- _cleanup_strv_free_ char **a = NULL;
- int r;
-
- r = read_next_mapping(map, 5, UINT_MAX, f, &n, &a);
- if (r < 0)
- return r;
- if (r == 0)
- break;
-
- if (!streq(c->vc_keymap, a[0]))
- continue;
-
- if (!streq_ptr(c->x11_layout, strnulldash(a[1])) ||
- !streq_ptr(c->x11_model, strnulldash(a[2])) ||
- !streq_ptr(c->x11_variant, strnulldash(a[3])) ||
- !streq_ptr(c->x11_options, strnulldash(a[4]))) {
-
- if (free_and_strdup(&c->x11_layout, strnulldash(a[1])) < 0 ||
- free_and_strdup(&c->x11_model, strnulldash(a[2])) < 0 ||
- free_and_strdup(&c->x11_variant, strnulldash(a[3])) < 0 ||
- free_and_strdup(&c->x11_options, strnulldash(a[4])) < 0)
- return -ENOMEM;
-
- modified = true;
- }
-
- break;
- }
- }
-
- if (modified > 0)
- log_info("Changing X11 keyboard layout to '%s' model '%s' variant '%s' options '%s'",
- strempty(c->x11_layout),
- strempty(c->x11_model),
- strempty(c->x11_variant),
- strempty(c->x11_options));
- else if (modified < 0)
- log_notice("X11 keyboard layout was not modified: no conversion found for \"%s\".",
- c->vc_keymap);
- else
- log_debug("X11 keyboard layout did not need to be modified.");
-
- return modified > 0;
-}
-
-int find_converted_keymap(const char *x11_layout, const char *x11_variant, char **new_keymap) {
- const char *dir;
- _cleanup_free_ char *n;
-
- if (x11_variant)
- n = strjoin(x11_layout, "-", x11_variant, NULL);
- else
- n = strdup(x11_layout);
- if (!n)
- return -ENOMEM;
-
- NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) {
- _cleanup_free_ char *p = NULL, *pz = NULL;
- bool uncompressed;
-
- p = strjoin(dir, "xkb/", n, ".map", NULL);
- pz = strjoin(dir, "xkb/", n, ".map.gz", NULL);
- if (!p || !pz)
- return -ENOMEM;
-
- uncompressed = access(p, F_OK) == 0;
- if (uncompressed || access(pz, F_OK) == 0) {
- log_debug("Found converted keymap %s at %s",
- n, uncompressed ? p : pz);
-
- *new_keymap = n;
- n = NULL;
- return 1;
- }
- }
-
- return 0;
-}
-
-int find_legacy_keymap(Context *c, char **new_keymap) {
- const char *map;
- _cleanup_fclose_ FILE *f = NULL;
- unsigned n = 0;
- unsigned best_matching = 0;
- int r;
-
- assert(!isempty(c->x11_layout));
-
- map = systemd_kbd_model_map();
-
- f = fopen(map, "re");
- if (!f)
- return -errno;
-
- for (;;) {
- _cleanup_strv_free_ char **a = NULL;
- unsigned matching = 0;
-
- r = read_next_mapping(map, 5, UINT_MAX, f, &n, &a);
- if (r < 0)
- return r;
- if (r == 0)
- break;
-
- /* Determine how well matching this entry is */
- if (streq(c->x11_layout, a[1]))
- /* If we got an exact match, this is best */
- matching = 10;
- else {
- /* We have multiple X layouts, look for an
- * entry that matches our key with everything
- * but the first layout stripped off. */
- if (startswith_comma(c->x11_layout, a[1]))
- matching = 5;
- else {
- char *x;
-
- /* If that didn't work, strip off the
- * other layouts from the entry, too */
- x = strndupa(a[1], strcspn(a[1], ","));
- if (startswith_comma(c->x11_layout, x))
- matching = 1;
- }
- }
-
- if (matching > 0) {
- if (isempty(c->x11_model) || streq_ptr(c->x11_model, a[2])) {
- matching++;
-
- if (streq_ptr(c->x11_variant, a[3])) {
- matching++;
-
- if (streq_ptr(c->x11_options, a[4]))
- matching++;
- }
- }
- }
-
- /* The best matching entry so far, then let's save that */
- if (matching >= MAX(best_matching, 1u)) {
- log_debug("Found legacy keymap %s with score %u",
- a[0], matching);
-
- if (matching > best_matching) {
- best_matching = matching;
-
- r = free_and_strdup(new_keymap, a[0]);
- if (r < 0)
- return r;
- }
- }
- }
-
- if (best_matching < 10 && c->x11_layout) {
- /* The best match is only the first part of the X11
- * keymap. Check if we have a converted map which
- * matches just the first layout.
- */
- char *l, *v = NULL, *converted;
-
- l = strndupa(c->x11_layout, strcspn(c->x11_layout, ","));
- if (c->x11_variant)
- v = strndupa(c->x11_variant, strcspn(c->x11_variant, ","));
- r = find_converted_keymap(l, v, &converted);
- if (r < 0)
- return r;
- if (r > 0) {
- free(*new_keymap);
- *new_keymap = converted;
- }
- }
-
- return (bool) *new_keymap;
-}
-
-int find_language_fallback(const char *lang, char **language) {
- const char *map;
- _cleanup_fclose_ FILE *f = NULL;
- unsigned n = 0;
-
- assert(lang);
- assert(language);
-
- map = systemd_language_fallback_map();
-
- f = fopen(map, "re");
- if (!f)
- return -errno;
-
- for (;;) {
- _cleanup_strv_free_ char **a = NULL;
- int r;
-
- r = read_next_mapping(map, 2, 2, f, &n, &a);
- if (r <= 0)
- return r;
-
- if (streq(lang, a[0])) {
- assert(strv_length(a) == 2);
- *language = a[1];
- a[1] = NULL;
- return 1;
- }
- }
-
- assert_not_reached("should not be here");
-}
-
-int x11_convert_to_vconsole(Context *c) {
- bool modified = false;
-
- if (isempty(c->x11_layout)) {
- modified =
- !isempty(c->vc_keymap) ||
- !isempty(c->vc_keymap_toggle);
-
- context_free_vconsole(c);
- } else {
- char *new_keymap = NULL;
- int r;
-
- r = find_converted_keymap(c->x11_layout, c->x11_variant, &new_keymap);
- if (r < 0)
- return r;
- else if (r == 0) {
- r = find_legacy_keymap(c, &new_keymap);
- if (r < 0)
- return r;
- }
- if (r == 0)
- /* We search for layout-variant match first, but then we also look
- * for anything which matches just the layout. So it's accurate to say
- * that we couldn't find anything which matches the layout. */
- log_notice("No conversion to virtual console map found for \"%s\".",
- c->x11_layout);
-
- if (!streq_ptr(c->vc_keymap, new_keymap)) {
- free(c->vc_keymap);
- c->vc_keymap = new_keymap;
- c->vc_keymap_toggle = mfree(c->vc_keymap_toggle);
- modified = true;
- } else
- free(new_keymap);
- }
-
- if (modified)
- log_info("Changing virtual console keymap to '%s' toggle '%s'",
- strempty(c->vc_keymap), strempty(c->vc_keymap_toggle));
- else
- log_debug("Virtual console keymap was not modified.");
-
- return modified;
-}
diff --git a/src/locale/keymap-util.h b/src/locale/keymap-util.h
deleted file mode 100644
index 20ef2a4a34..0000000000
--- a/src/locale/keymap-util.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2011 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "locale-util.h"
-
-typedef struct Context {
- char *locale[_VARIABLE_LC_MAX];
-
- char *x11_layout;
- char *x11_model;
- char *x11_variant;
- char *x11_options;
-
- char *vc_keymap;
- char *vc_keymap_toggle;
-} Context;
-
-int find_converted_keymap(const char *x11_layout, const char *x11_variant, char **new_keymap);
-int find_legacy_keymap(Context *c, char **new_keymap);
-int find_language_fallback(const char *lang, char **language);
-
-int context_read_data(Context *c);
-void context_free(Context *c);
-int vconsole_convert_to_x11(Context *c);
-int vconsole_write_data(Context *c);
-int x11_convert_to_vconsole(Context *c);
-int x11_write_data(Context *c);
-void locale_simplify(Context *c);
-int locale_write_data(Context *c, char ***settings);
diff --git a/src/locale/language-fallback-map b/src/locale/language-fallback-map
deleted file mode 100644
index d0b02a6b98..0000000000
--- a/src/locale/language-fallback-map
+++ /dev/null
@@ -1,13 +0,0 @@
-csb_PL csb:pl
-en_AU en_AU:en_GB
-en_IE en_IE:en_GB
-en_NZ en_NZ:en_GB
-en_ZA en_ZA:en_GB
-fr_BE fr_BE:fr_FR
-fr_CA fr_CA:fr_FR
-fr_CH fr_CH:fr_FR
-fr_LU fr_LU:fr_FR
-it_CH it_CH:it_IT
-mai_IN mai:hi
-nds_DE nds:de
-szl_PL szl:pl
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
deleted file mode 100644
index 81afb4909f..0000000000
--- a/src/locale/localectl.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/***
- 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <ftw.h>
-#include <getopt.h>
-#include <locale.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "sd-bus.h"
-
-#include "bus-error.h"
-#include "bus-util.h"
-#include "def.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "locale-util.h"
-#include "pager.h"
-#include "set.h"
-#include "spawn-polkit-agent.h"
-#include "strv.h"
-#include "util.h"
-#include "virt.h"
-
-static bool arg_no_pager = false;
-static bool arg_ask_password = true;
-static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
-static char *arg_host = NULL;
-static bool arg_convert = true;
-
-static void polkit_agent_open_if_enabled(void) {
-
- /* Open the polkit agent as a child process if necessary */
- if (!arg_ask_password)
- return;
-
- if (arg_transport != BUS_TRANSPORT_LOCAL)
- return;
-
- polkit_agent_open();
-}
-
-typedef struct StatusInfo {
- char **locale;
- char *vconsole_keymap;
- char *vconsole_keymap_toggle;
- char *x11_layout;
- char *x11_model;
- char *x11_variant;
- char *x11_options;
-} StatusInfo;
-
-static void status_info_clear(StatusInfo *info) {
- if (info) {
- strv_free(info->locale);
- free(info->vconsole_keymap);
- free(info->vconsole_keymap_toggle);
- free(info->x11_layout);
- free(info->x11_model);
- free(info->x11_variant);
- free(info->x11_options);
- zero(*info);
- }
-}
-
-static void print_overridden_variables(void) {
- int r;
- char *variables[_VARIABLE_LC_MAX] = {};
- LocaleVariable j;
- bool print_warning = true;
-
- if (detect_container() > 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);
-
- if (strv_isempty(i->locale))
- puts(" System Locale: n/a");
- else {
- char **j;
-
- printf(" System Locale: %s\n", i->locale[0]);
- STRV_FOREACH(j, i->locale + 1)
- printf(" %s\n", *j);
- }
-
- printf(" VC Keymap: %s\n", strna(i->vconsole_keymap));
- if (!isempty(i->vconsole_keymap_toggle))
- printf("VC Toggle Keymap: %s\n", i->vconsole_keymap_toggle);
-
- printf(" X11 Layout: %s\n", strna(i->x11_layout));
- if (!isempty(i->x11_model))
- printf(" X11 Model: %s\n", i->x11_model);
- if (!isempty(i->x11_variant))
- printf(" X11 Variant: %s\n", i->x11_variant);
- if (!isempty(i->x11_options))
- printf(" X11 Options: %s\n", i->x11_options);
-}
-
-static int show_status(sd_bus *bus, char **args, unsigned n) {
- _cleanup_(status_info_clear) StatusInfo info = {};
- static const struct bus_properties_map map[] = {
- { "VConsoleKeymap", "s", NULL, offsetof(StatusInfo, vconsole_keymap) },
- { "VConsoleKeymap", "s", NULL, offsetof(StatusInfo, vconsole_keymap) },
- { "VConsoleKeymapToggle", "s", NULL, offsetof(StatusInfo, vconsole_keymap_toggle) },
- { "X11Layout", "s", NULL, offsetof(StatusInfo, x11_layout) },
- { "X11Model", "s", NULL, offsetof(StatusInfo, x11_model) },
- { "X11Variant", "s", NULL, offsetof(StatusInfo, x11_variant) },
- { "X11Options", "s", NULL, offsetof(StatusInfo, x11_options) },
- { "Locale", "as", NULL, offsetof(StatusInfo, locale) },
- {}
- };
- int r;
-
- assert(bus);
-
- r = bus_map_all_properties(bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- map,
- &info);
- if (r < 0)
- return log_error_errno(r, "Could not get properties: %m");
-
- print_overridden_variables();
- print_status_info(&info);
-
- return r;
-}
-
-static int set_locale(sd_bus *bus, char **args, unsigned n) {
- _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
- _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
-
- assert(bus);
- assert(args);
-
- polkit_agent_open_if_enabled();
-
- r = sd_bus_message_new_method_call(
- bus,
- &m,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "SetLocale");
- if (r < 0)
- return bus_log_create_error(r);
-
- r = sd_bus_message_append_strv(m, args + 1);
- if (r < 0)
- return bus_log_create_error(r);
-
- r = sd_bus_message_append(m, "b", arg_ask_password);
- if (r < 0)
- return bus_log_create_error(r);
-
- 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;
- }
-
- return 0;
-}
-
-static int list_locales(sd_bus *bus, char **args, unsigned n) {
- _cleanup_strv_free_ char **l = NULL;
- int r;
-
- assert(args);
-
- r = get_locales(&l);
- if (r < 0)
- return log_error_errno(r, "Failed to read list of locales: %m");
-
- pager_open(arg_no_pager, false);
- strv_print(l);
-
- return 0;
-}
-
-static int set_vconsole_keymap(sd_bus *bus, char **args, unsigned n) {
- _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
- const char *map, *toggle_map;
- int r;
-
- assert(bus);
- assert(args);
-
- if (n > 3) {
- log_error("Too many arguments.");
- return -EINVAL;
- }
-
- polkit_agent_open_if_enabled();
-
- map = args[1];
- toggle_map = n > 2 ? args[2] : "";
-
- r = sd_bus_call_method(
- bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "SetVConsoleKeyboard",
- &error,
- NULL,
- "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;
-
-static int nftw_cb(
- const char *fpath,
- const struct stat *sb,
- int tflag,
- struct FTW *ftwbuf) {
-
- char *p, *e;
- int r;
-
- if (tflag != FTW_F)
- return 0;
-
- if (!endswith(fpath, ".map") &&
- !endswith(fpath, ".map.gz"))
- return 0;
-
- p = strdup(basename(fpath));
- if (!p)
- return log_oom();
-
- e = endswith(p, ".map");
- if (e)
- *e = 0;
-
- e = endswith(p, ".map.gz");
- if (e)
- *e = 0;
-
- r = set_consume(keymaps, p);
- 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_ops);
- if (!keymaps)
- return log_oom();
-
- NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS)
- nftw(dir, nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
-
- l = set_get_strv(keymaps);
- if (!l) {
- set_free_free(keymaps);
- return log_oom();
- }
-
- set_free(keymaps);
-
- if (strv_isempty(l)) {
- log_error("Couldn't find any console keymaps.");
- return -ENOENT;
- }
-
- strv_sort(l);
-
- pager_open(arg_no_pager, false);
-
- strv_print(l);
-
- return 0;
-}
-
-static int set_x11_keymap(sd_bus *bus, char **args, unsigned n) {
- _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
- const char *layout, *model, *variant, *options;
- int r;
-
- assert(bus);
- assert(args);
-
- if (n > 5) {
- log_error("Too many arguments.");
- return -EINVAL;
- }
-
- polkit_agent_open_if_enabled();
-
- layout = args[1];
- model = n > 2 ? args[2] : "";
- variant = n > 3 ? args[3] : "";
- options = n > 4 ? args[4] : "";
-
- r = sd_bus_call_method(
- bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "SetX11Keyboard",
- &error,
- NULL,
- "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)
- return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
-
- 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(arg_no_pager, false);
-
- strv_print(list);
- return 0;
-}
-
-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"
- " --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"
- " --no-convert Don't convert keyboard mappings\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 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 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);
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
- enum {
- ARG_VERSION = 0x100,
- ARG_NO_PAGER,
- ARG_NO_CONVERT,
- ARG_NO_ASK_PASSWORD
- };
-
- 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' },
- { "machine", required_argument, NULL, 'M' },
- { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
- { "no-convert", no_argument, NULL, ARG_NO_CONVERT },
- {}
- };
-
- int c;
-
- assert(argc >= 0);
- assert(argv);
-
- while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0)
-
- switch (c) {
-
- case 'h':
- help();
- return 0;
-
- case ARG_VERSION:
- return version();
-
- case ARG_NO_CONVERT:
- arg_convert = false;
- break;
-
- case ARG_NO_PAGER:
- 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_MACHINE;
- arg_host = optarg;
- break;
-
- case '?':
- return -EINVAL;
-
- default:
- assert_not_reached("Unhandled option");
- }
-
- return 1;
-}
-
-static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
-
- static const struct {
- const char* verb;
- const enum {
- MORE,
- LESS,
- EQUAL
- } argc_cmp;
- const int argc;
- 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 },
- { "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;
- unsigned i;
-
- assert(argc >= 0);
- assert(argv);
-
- left = argc - optind;
-
- if (left <= 0)
- /* Special rule: no arguments means "status" */
- i = 0;
- else {
- if (streq(argv[optind], "help")) {
- help();
- return 0;
- }
-
- for (i = 0; i < ELEMENTSOF(verbs); i++)
- if (streq(argv[optind], verbs[i].verb))
- break;
-
- if (i >= ELEMENTSOF(verbs)) {
- log_error("Unknown operation %s", argv[optind]);
- return -EINVAL;
- }
- }
-
- switch (verbs[i].argc_cmp) {
-
- case EQUAL:
- if (left != verbs[i].argc) {
- log_error("Invalid number of arguments.");
- return -EINVAL;
- }
-
- break;
-
- case MORE:
- if (left < verbs[i].argc) {
- log_error("Too few arguments.");
- return -EINVAL;
- }
-
- break;
-
- case LESS:
- if (left > verbs[i].argc) {
- log_error("Too many arguments.");
- return -EINVAL;
- }
-
- break;
-
- default:
- assert_not_reached("Unknown comparison operator.");
- }
-
- return verbs[i].dispatch(bus, argv + optind, left);
-}
-
-int main(int argc, char*argv[]) {
- sd_bus *bus = NULL;
- int r;
-
- setlocale(LC_ALL, "");
- log_parse_environment();
- log_open();
-
- r = parse_argv(argc, argv);
- if (r <= 0)
- goto finish;
-
- r = bus_connect_transport(arg_transport, arg_host, false, &bus);
- if (r < 0) {
- log_error_errno(r, "Failed to create bus connection: %m");
- goto finish;
- }
-
- r = localectl_main(bus, argc, argv);
-
-finish:
- sd_bus_flush_close_unref(bus);
- pager_close();
-
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
diff --git a/src/locale/localed.c b/src/locale/localed.c
deleted file mode 100644
index 1cb049e74a..0000000000
--- a/src/locale/localed.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2011 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef HAVE_XKBCOMMON
-#include <xkbcommon/xkbcommon.h>
-#include <dlfcn.h>
-#endif
-
-#include "sd-bus.h"
-
-#include "alloc-util.h"
-#include "bus-error.h"
-#include "bus-message.h"
-#include "bus-util.h"
-#include "def.h"
-#include "keymap-util.h"
-#include "locale-util.h"
-#include "macro.h"
-#include "path-util.h"
-#include "selinux-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "user-util.h"
-
-static Hashmap *polkit_registry = NULL;
-
-static int locale_update_system_manager(Context *c, sd_bus *bus) {
- _cleanup_free_ char **l_unset = NULL;
- _cleanup_strv_free_ char **l_set = NULL;
- _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
- sd_bus_error error = SD_BUS_ERROR_NULL;
- unsigned c_set, c_unset, p;
- int r;
-
- assert(bus);
-
- l_unset = new0(char*, _VARIABLE_LC_MAX);
- if (!l_unset)
- return -ENOMEM;
-
- l_set = new0(char*, _VARIABLE_LC_MAX);
- if (!l_set)
- return -ENOMEM;
-
- for (p = 0, c_set = 0, c_unset = 0; p < _VARIABLE_LC_MAX; p++) {
- const char *name;
-
- name = locale_variable_to_string(p);
- assert(name);
-
- if (isempty(c->locale[p]))
- l_unset[c_set++] = (char*) name;
- else {
- char *s;
-
- if (asprintf(&s, "%s=%s", name, c->locale[p]) < 0)
- return -ENOMEM;
-
- l_set[c_unset++] = s;
- }
- }
-
- assert(c_set + c_unset == _VARIABLE_LC_MAX);
- r = sd_bus_message_new_method_call(bus, &m,
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "UnsetAndSetEnvironment");
- if (r < 0)
- return r;
-
- r = sd_bus_message_append_strv(m, l_unset);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append_strv(m, l_set);
- if (r < 0)
- return r;
-
- r = sd_bus_call(bus, m, 0, &error, NULL);
- if (r < 0)
- log_error_errno(r, "Failed to update the manager environment: %m");
-
- return 0;
-}
-
-static int vconsole_reload(sd_bus *bus) {
- _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
- int r;
-
- assert(bus);
-
- r = sd_bus_call_method(bus,
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "RestartUnit",
- &error,
- NULL,
- "ss", "systemd-vconsole-setup.service", "replace");
-
- if (r < 0)
- log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
- return r;
-}
-
-static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus *bus) {
- int r;
-
- assert(bus);
-
- r = vconsole_convert_to_x11(c);
- if (r <= 0)
- return r;
-
- /* modified */
- r = x11_write_data(c);
- if (r < 0)
- return log_error_errno(r, "Failed to write X11 keyboard layout: %m");
-
- sd_bus_emit_properties_changed(bus,
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "X11Layout", "X11Model", "X11Variant", "X11Options", NULL);
-
- return 1;
-}
-
-static int x11_convert_to_vconsole_and_emit(Context *c, sd_bus *bus) {
- int r;
-
- assert(bus);
-
- r = x11_convert_to_vconsole(c);
- if (r <= 0)
- return r;
-
- /* modified */
- r = vconsole_write_data(c);
- if (r < 0)
- log_error_errno(r, "Failed to save virtual console keymap: %m");
-
- sd_bus_emit_properties_changed(bus,
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "VConsoleKeymap", "VConsoleKeymapToggle", NULL);
-
- return vconsole_reload(bus);
-}
-
-static int property_get_locale(
- sd_bus *bus,
- const char *path,
- const char *interface,
- const char *property,
- sd_bus_message *reply,
- void *userdata,
- sd_bus_error *error) {
-
- Context *c = userdata;
- _cleanup_strv_free_ char **l = NULL;
- int p, q;
-
- l = new0(char*, _VARIABLE_LC_MAX+1);
- if (!l)
- return -ENOMEM;
-
- for (p = 0, q = 0; p < _VARIABLE_LC_MAX; p++) {
- char *t;
- const char *name;
-
- name = locale_variable_to_string(p);
- assert(name);
-
- if (isempty(c->locale[p]))
- continue;
-
- if (asprintf(&t, "%s=%s", name, c->locale[p]) < 0)
- return -ENOMEM;
-
- l[q++] = t;
- }
-
- return sd_bus_message_append_strv(reply, l);
-}
-
-static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *error) {
- Context *c = userdata;
- _cleanup_strv_free_ char **l = NULL;
- char **i;
- const char *lang = NULL;
- int interactive;
- bool modified = false;
- bool have[_VARIABLE_LC_MAX] = {};
- int p;
- int r;
-
- assert(m);
- assert(c);
-
- r = bus_message_read_strv_extend(m, &l);
- if (r < 0)
- return r;
-
- r = sd_bus_message_read_basic(m, 'b', &interactive);
- if (r < 0)
- return r;
-
- /* Check whether a variable changed and if it is valid */
- STRV_FOREACH(i, l) {
- bool valid = false;
-
- for (p = 0; p < _VARIABLE_LC_MAX; p++) {
- size_t k;
- const char *name;
-
- name = locale_variable_to_string(p);
- assert(name);
-
- k = strlen(name);
- if (startswith(*i, name) &&
- (*i)[k] == '=' &&
- locale_is_valid((*i) + k + 1)) {
- valid = true;
- have[p] = true;
-
- if (p == VARIABLE_LANG)
- lang = (*i) + k + 1;
-
- if (!streq_ptr(*i + k + 1, c->locale[p]))
- modified = true;
-
- break;
- }
- }
-
- if (!valid)
- return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data.");
- }
-
- /* If LANG was specified, but not LANGUAGE, check if we should
- * set it based on the language fallback table. */
- if (have[VARIABLE_LANG] && !have[VARIABLE_LANGUAGE]) {
- _cleanup_free_ char *language = NULL;
-
- assert(lang);
-
- (void) find_language_fallback(lang, &language);
- if (language) {
- log_debug("Converted LANG=%s to LANGUAGE=%s", lang, language);
- if (!streq_ptr(language, c->locale[VARIABLE_LANGUAGE])) {
- r = strv_extendf(&l, "LANGUAGE=%s", language);
- if (r < 0)
- return r;
-
- have[VARIABLE_LANGUAGE] = true;
- modified = true;
- }
- }
- }
-
- /* Check whether a variable is unset */
- if (!modified)
- for (p = 0; p < _VARIABLE_LC_MAX; p++)
- if (!isempty(c->locale[p]) && !have[p]) {
- modified = true;
- break;
- }
-
- if (modified) {
- _cleanup_strv_free_ char **settings = NULL;
-
- r = bus_verify_polkit_async(
- m,
- CAP_SYS_ADMIN,
- "org.freedesktop.locale1.set-locale",
- NULL,
- interactive,
- UID_INVALID,
- &polkit_registry,
- error);
- if (r < 0)
- return r;
- if (r == 0)
- return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
-
- STRV_FOREACH(i, l)
- for (p = 0; p < _VARIABLE_LC_MAX; p++) {
- size_t k;
- const char *name;
-
- name = locale_variable_to_string(p);
- assert(name);
-
- k = strlen(name);
- if (startswith(*i, name) && (*i)[k] == '=') {
- r = free_and_strdup(&c->locale[p], *i + k + 1);
- if (r < 0)
- return r;
- break;
- }
- }
-
- for (p = 0; p < _VARIABLE_LC_MAX; p++) {
- if (have[p])
- continue;
-
- c->locale[p] = mfree(c->locale[p]);
- }
-
- locale_simplify(c);
-
- r = locale_write_data(c, &settings);
- if (r < 0) {
- log_error_errno(r, "Failed to set locale: %m");
- return sd_bus_error_set_errnof(error, r, "Failed to set locale: %m");
- }
-
- locale_update_system_manager(c, sd_bus_message_get_bus(m));
-
- if (settings) {
- _cleanup_free_ char *line;
-
- line = strv_join(settings, ", ");
- log_info("Changed locale to %s.", strnull(line));
- } else
- log_info("Changed locale to unset.");
-
- (void) sd_bus_emit_properties_changed(
- sd_bus_message_get_bus(m),
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "Locale", NULL);
- } else
- log_debug("Locale settings were not modified.");
-
-
- return sd_bus_reply_method_return(m, NULL);
-}
-
-static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_error *error) {
- Context *c = userdata;
- const char *keymap, *keymap_toggle;
- int convert, interactive;
- int r;
-
- assert(m);
- assert(c);
-
- r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive);
- if (r < 0)
- return r;
-
- keymap = empty_to_null(keymap);
- keymap_toggle = empty_to_null(keymap_toggle);
-
- if (!streq_ptr(keymap, c->vc_keymap) ||
- !streq_ptr(keymap_toggle, c->vc_keymap_toggle)) {
-
- if ((keymap && (!filename_is_valid(keymap) || !string_is_safe(keymap))) ||
- (keymap_toggle && (!filename_is_valid(keymap_toggle) || !string_is_safe(keymap_toggle))))
- return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keymap data");
-
- r = bus_verify_polkit_async(
- m,
- CAP_SYS_ADMIN,
- "org.freedesktop.locale1.set-keyboard",
- NULL,
- interactive,
- UID_INVALID,
- &polkit_registry,
- error);
- if (r < 0)
- return r;
- if (r == 0)
- return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
-
- if (free_and_strdup(&c->vc_keymap, keymap) < 0 ||
- free_and_strdup(&c->vc_keymap_toggle, keymap_toggle) < 0)
- return -ENOMEM;
-
- r = vconsole_write_data(c);
- if (r < 0) {
- log_error_errno(r, "Failed to set virtual console keymap: %m");
- return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %m");
- }
-
- log_info("Changed virtual console keymap to '%s' toggle '%s'",
- strempty(c->vc_keymap), strempty(c->vc_keymap_toggle));
-
- r = vconsole_reload(sd_bus_message_get_bus(m));
- if (r < 0)
- log_error_errno(r, "Failed to request keymap reload: %m");
-
- (void) sd_bus_emit_properties_changed(
- sd_bus_message_get_bus(m),
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "VConsoleKeymap", "VConsoleKeymapToggle", NULL);
-
- if (convert) {
- r = vconsole_convert_to_x11_and_emit(c, sd_bus_message_get_bus(m));
- if (r < 0)
- log_error_errno(r, "Failed to convert keymap data: %m");
- }
- }
-
- return sd_bus_reply_method_return(m, NULL);
-}
-
-#ifdef HAVE_XKBCOMMON
-
-_printf_(3, 0)
-static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) {
- const char *fmt;
-
- fmt = strjoina("libxkbcommon: ", format);
- log_internalv(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, fmt, args);
-}
-
-#define LOAD_SYMBOL(symbol, dl, name) \
- ({ \
- (symbol) = (typeof(symbol)) dlvsym((dl), (name), "V_0.5.0"); \
- (symbol) ? 0 : -EOPNOTSUPP; \
- })
-
-static int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) {
-
- /* We dlopen() the library in order to make the dependency soft. The library (and what it pulls in) is huge
- * after all, hence let's support XKB maps when the library is around, and refuse otherwise. The function
- * pointers to the shared library are below: */
-
- struct xkb_context* (*symbol_xkb_context_new)(enum xkb_context_flags flags) = NULL;
- void (*symbol_xkb_context_unref)(struct xkb_context *context) = NULL;
- void (*symbol_xkb_context_set_log_fn)(struct xkb_context *context, void (*log_fn)(struct xkb_context *context, enum xkb_log_level level, const char *format, va_list args)) = NULL;
- struct xkb_keymap* (*symbol_xkb_keymap_new_from_names)(struct xkb_context *context, const struct xkb_rule_names *names, enum xkb_keymap_compile_flags flags) = NULL;
- void (*symbol_xkb_keymap_unref)(struct xkb_keymap *keymap) = NULL;
-
- const struct xkb_rule_names rmlvo = {
- .model = model,
- .layout = layout,
- .variant = variant,
- .options = options,
- };
- struct xkb_context *ctx = NULL;
- struct xkb_keymap *km = NULL;
- void *dl;
- int r;
-
- /* Compile keymap from RMLVO information to check out its validity */
-
- dl = dlopen("libxkbcommon.so.0", RTLD_LAZY);
- if (!dl)
- return -EOPNOTSUPP;
-
- r = LOAD_SYMBOL(symbol_xkb_context_new, dl, "xkb_context_new");
- if (r < 0)
- goto finish;
-
- r = LOAD_SYMBOL(symbol_xkb_context_unref, dl, "xkb_context_unref");
- if (r < 0)
- goto finish;
-
- r = LOAD_SYMBOL(symbol_xkb_context_set_log_fn, dl, "xkb_context_set_log_fn");
- if (r < 0)
- goto finish;
-
- r = LOAD_SYMBOL(symbol_xkb_keymap_new_from_names, dl, "xkb_keymap_new_from_names");
- if (r < 0)
- goto finish;
-
- r = LOAD_SYMBOL(symbol_xkb_keymap_unref, dl, "xkb_keymap_unref");
- if (r < 0)
- goto finish;
-
- ctx = symbol_xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
- if (!ctx) {
- r = -ENOMEM;
- goto finish;
- }
-
- symbol_xkb_context_set_log_fn(ctx, log_xkb);
-
- km = symbol_xkb_keymap_new_from_names(ctx, &rmlvo, XKB_KEYMAP_COMPILE_NO_FLAGS);
- if (!km) {
- r = -EINVAL;
- goto finish;
- }
-
- r = 0;
-
-finish:
- if (symbol_xkb_keymap_unref && km)
- symbol_xkb_keymap_unref(km);
-
- if (symbol_xkb_context_unref && ctx)
- symbol_xkb_context_unref(ctx);
-
- (void) dlclose(dl);
- return r;
-}
-
-#else
-
-static int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) {
- return 0;
-}
-
-#endif
-
-static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_error *error) {
- Context *c = userdata;
- const char *layout, *model, *variant, *options;
- int convert, interactive;
- int r;
-
- assert(m);
- assert(c);
-
- r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive);
- if (r < 0)
- return r;
-
- layout = empty_to_null(layout);
- model = empty_to_null(model);
- variant = empty_to_null(variant);
- options = empty_to_null(options);
-
- if (!streq_ptr(layout, c->x11_layout) ||
- !streq_ptr(model, c->x11_model) ||
- !streq_ptr(variant, c->x11_variant) ||
- !streq_ptr(options, c->x11_options)) {
-
- if ((layout && !string_is_safe(layout)) ||
- (model && !string_is_safe(model)) ||
- (variant && !string_is_safe(variant)) ||
- (options && !string_is_safe(options)))
- return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keyboard data");
-
- r = bus_verify_polkit_async(
- m,
- CAP_SYS_ADMIN,
- "org.freedesktop.locale1.set-keyboard",
- NULL,
- interactive,
- UID_INVALID,
- &polkit_registry,
- error);
- if (r < 0)
- return r;
- if (r == 0)
- return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
-
- r = verify_xkb_rmlvo(model, layout, variant, options);
- if (r < 0) {
- log_error_errno(r, "Cannot compile XKB keymap for new x11 keyboard layout ('%s' / '%s' / '%s' / '%s'): %m",
- strempty(model), strempty(layout), strempty(variant), strempty(options));
-
- if (r == -EOPNOTSUPP)
- return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Local keyboard configuration not supported on this system.");
-
- return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Specified keymap cannot be compiled, refusing as invalid.");
- }
-
- if (free_and_strdup(&c->x11_layout, layout) < 0 ||
- free_and_strdup(&c->x11_model, model) < 0 ||
- free_and_strdup(&c->x11_variant, variant) < 0 ||
- free_and_strdup(&c->x11_options, options) < 0)
- return -ENOMEM;
-
- r = x11_write_data(c);
- if (r < 0) {
- log_error_errno(r, "Failed to set X11 keyboard layout: %m");
- return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %m");
- }
-
- log_info("Changed X11 keyboard layout to '%s' model '%s' variant '%s' options '%s'",
- strempty(c->x11_layout),
- strempty(c->x11_model),
- strempty(c->x11_variant),
- strempty(c->x11_options));
-
- (void) sd_bus_emit_properties_changed(
- sd_bus_message_get_bus(m),
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "X11Layout", "X11Model", "X11Variant", "X11Options", NULL);
-
- if (convert) {
- r = x11_convert_to_vconsole_and_emit(c, sd_bus_message_get_bus(m));
- if (r < 0)
- log_error_errno(r, "Failed to convert keymap data: %m");
- }
- }
-
- return sd_bus_reply_method_return(m, NULL);
-}
-
-static const sd_bus_vtable locale_vtable[] = {
- SD_BUS_VTABLE_START(0),
- SD_BUS_PROPERTY("Locale", "as", property_get_locale, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("X11Layout", "s", NULL, offsetof(Context, x11_layout), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("X11Model", "s", NULL, offsetof(Context, x11_model), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("X11Variant", "s", NULL, offsetof(Context, x11_variant), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("X11Options", "s", NULL, offsetof(Context, x11_options), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("VConsoleKeymap", "s", NULL, offsetof(Context, vc_keymap), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", NULL, offsetof(Context, vc_keymap_toggle), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_METHOD("SetLocale", "asb", NULL, method_set_locale, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD("SetVConsoleKeyboard", "ssbb", NULL, method_set_vc_keyboard, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD("SetX11Keyboard", "ssssbb", NULL, method_set_x11_keyboard, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_VTABLE_END
-};
-
-static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
- _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
- int r;
-
- assert(c);
- assert(event);
- assert(_bus);
-
- r = sd_bus_default_system(&bus);
- if (r < 0)
- return log_error_errno(r, "Failed to get system bus connection: %m");
-
- r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
- if (r < 0)
- return log_error_errno(r, "Failed to register object: %m");
-
- r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
- if (r < 0)
- return log_error_errno(r, "Failed to register name: %m");
-
- r = sd_bus_attach_event(bus, event, 0);
- if (r < 0)
- return log_error_errno(r, "Failed to attach bus to event loop: %m");
-
- *_bus = bus;
- bus = NULL;
-
- return 0;
-}
-
-int main(int argc, char *argv[]) {
- _cleanup_(context_free) Context context = {};
- _cleanup_(sd_event_unrefp) sd_event *event = NULL;
- _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
- int r;
-
- log_set_target(LOG_TARGET_AUTO);
- log_parse_environment();
- log_open();
-
- umask(0022);
- mac_selinux_init();
-
- if (argc != 1) {
- log_error("This program takes no arguments.");
- r = -EINVAL;
- goto finish;
- }
-
- r = sd_event_default(&event);
- if (r < 0) {
- log_error_errno(r, "Failed to allocate event loop: %m");
- goto finish;
- }
-
- sd_event_set_watchdog(event, true);
-
- r = connect_bus(&context, event, &bus);
- if (r < 0)
- goto finish;
-
- r = context_read_data(&context);
- if (r < 0) {
- log_error_errno(r, "Failed to read locale data: %m");
- goto finish;
- }
-
- r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL);
- if (r < 0)
- log_error_errno(r, "Failed to run event loop: %m");
-
-finish:
- bus_verify_polkit_async_registry_free(polkit_registry);
-
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
diff --git a/src/locale/org.freedesktop.locale1.conf b/src/locale/org.freedesktop.locale1.conf
deleted file mode 100644
index 79d0ecd2bb..0000000000
--- a/src/locale/org.freedesktop.locale1.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
--->
-
-<busconfig>
-
- <policy user="root">
- <allow own="org.freedesktop.locale1"/>
- <allow send_destination="org.freedesktop.locale1"/>
- <allow receive_sender="org.freedesktop.locale1"/>
- </policy>
-
- <policy context="default">
- <allow send_destination="org.freedesktop.locale1"/>
- <allow receive_sender="org.freedesktop.locale1"/>
- </policy>
-
-</busconfig>
diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy.in
deleted file mode 100644
index df63845e9b..0000000000
--- a/src/locale/org.freedesktop.locale1.policy.in
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
--->
-
-<policyconfig>
-
- <vendor>The systemd Project</vendor>
- <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-
- <action id="org.freedesktop.locale1.set-locale">
- <_description>Set system locale</_description>
- <_message>Authentication is required to set the system locale.</_message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.imply">org.freedesktop.locale1.set-keyboard</annotate>
- </action>
-
- <action id="org.freedesktop.locale1.set-keyboard">
- <_description>Set system keyboard settings</_description>
- <_message>Authentication is required to set the system keyboard settings.</_message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
-</policyconfig>
diff --git a/src/locale/org.freedesktop.locale1.service b/src/locale/org.freedesktop.locale1.service
deleted file mode 100644
index 025f9a0fc2..0000000000
--- a/src/locale/org.freedesktop.locale1.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is part of systemd.
-#
-# 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
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[D-BUS Service]
-Name=org.freedesktop.locale1
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.freedesktop.locale1.service
diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
deleted file mode 100644
index 2adda3da2b..0000000000
--- a/src/locale/test-keymap-util.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2016 Zbigniew Jędrzejewski-Szmek
-
- 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
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "alloc-util.h"
-#include "keymap-util.h"
-#include "log.h"
-#include "string-util.h"
-
-static void test_find_language_fallback(void) {
- _cleanup_free_ char *ans = NULL, *ans2 = NULL;
-
- log_info("/*** %s ***/", __func__);
-
- assert_se(find_language_fallback("foobar", &ans) == 0);
- assert_se(ans == NULL);
-
- assert_se(find_language_fallback("csb", &ans) == 0);
- assert_se(ans == NULL);
-
- assert_se(find_language_fallback("csb_PL", &ans) == 1);
- assert_se(streq(ans, "csb:pl"));
-
- assert_se(find_language_fallback("szl_PL", &ans2) == 1);
- assert_se(streq(ans2, "szl:pl"));
-}
-
-static void test_find_converted_keymap(void) {
- _cleanup_free_ char *ans = NULL, *ans2 = NULL;
- int r;
-
- log_info("/*** %s ***/", __func__);
-
- assert_se(find_converted_keymap("pl", "foobar", &ans) == 0);
- assert_se(ans == NULL);
-
- r = find_converted_keymap("pl", NULL, &ans);
- if (r == 0) {
- log_info("Skipping rest of %s: keymaps are not installed", __func__);
- return;
- }
-
- assert_se(r == 1);
- assert_se(streq(ans, "pl"));
-
- assert_se(find_converted_keymap("pl", "dvorak", &ans2) == 1);
- assert_se(streq(ans2, "pl-dvorak"));
-}
-
-static void test_find_legacy_keymap(void) {
- Context c = {};
- _cleanup_free_ char *ans = NULL, *ans2 = NULL;
-
- log_info("/*** %s ***/", __func__);
-
- c.x11_layout = (char*) "foobar";
- assert_se(find_legacy_keymap(&c, &ans) == 0);
- assert_se(ans == NULL);
-
- c.x11_layout = (char*) "pl";
- assert_se(find_legacy_keymap(&c, &ans) == 1);
- assert_se(streq(ans, "pl2"));
-
- c.x11_layout = (char*) "pl,ru";
- assert_se(find_legacy_keymap(&c, &ans2) == 1);
- assert_se(streq(ans, "pl2"));
-}
-
-static void test_vconsole_convert_to_x11(void) {
- _cleanup_(context_free) Context c = {};
-
- log_info("/*** %s ***/", __func__);
-
- log_info("/* test emptying first (:) */");
- assert_se(free_and_strdup(&c.x11_layout, "foo") >= 0);
- assert_se(free_and_strdup(&c.x11_variant, "bar") >= 0);
- assert_se(vconsole_convert_to_x11(&c) == 1);
- assert_se(c.x11_layout == NULL);
- assert_se(c.x11_variant == NULL);
-
- log_info("/* test emptying second (:) */");
-
- assert_se(vconsole_convert_to_x11(&c) == 0);
- assert_se(c.x11_layout == NULL);
- assert_se(c.x11_variant == NULL);
-
- log_info("/* test without variant, new mapping (es:) */");
- assert_se(free_and_strdup(&c.vc_keymap, "es") >= 0);
-
- assert_se(vconsole_convert_to_x11(&c) == 1);
- assert_se(streq(c.x11_layout, "es"));
- assert_se(c.x11_variant == NULL);
-
- log_info("/* test with known variant, new mapping (es:dvorak) */");
- assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0);
-
- assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME
- assert_se(streq(c.x11_layout, "es"));
- assert_se(c.x11_variant == NULL); // FIXME: "dvorak"
-
- log_info("/* test with old mapping (fr:latin9) */");
- assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0);
-
- assert_se(vconsole_convert_to_x11(&c) == 1);
- assert_se(streq(c.x11_layout, "fr"));
- assert_se(streq(c.x11_variant, "latin9"));
-
- log_info("/* test with a compound mapping (ru,us) */");
- assert_se(free_and_strdup(&c.vc_keymap, "ru") >= 0);
-
- assert_se(vconsole_convert_to_x11(&c) == 1);
- assert_se(streq(c.x11_layout, "ru,us"));
- assert_se(c.x11_variant == NULL);
-
- log_info("/* test with a simple mapping (us) */");
- assert_se(free_and_strdup(&c.vc_keymap, "us") >= 0);
-
- assert_se(vconsole_convert_to_x11(&c) == 1);
- assert_se(streq(c.x11_layout, "us"));
- assert_se(c.x11_variant == NULL);
-}
-
-static void test_x11_convert_to_vconsole(void) {
- _cleanup_(context_free) Context c = {};
- int r;
-
- log_info("/*** %s ***/", __func__);
-
- log_info("/* test emptying first (:) */");
- assert_se(free_and_strdup(&c.vc_keymap, "foobar") >= 0);
- assert_se(x11_convert_to_vconsole(&c) == 1);
- assert_se(c.vc_keymap == NULL);
-
- log_info("/* test emptying second (:) */");
-
- assert_se(x11_convert_to_vconsole(&c) == 0);
- assert_se(c.vc_keymap == NULL);
-
- log_info("/* test without variant, new mapping (es:) */");
- assert_se(free_and_strdup(&c.x11_layout, "es") >= 0);
-
- assert_se(x11_convert_to_vconsole(&c) == 1);
- assert_se(streq(c.vc_keymap, "es"));
-
- log_info("/* test with unknown variant, new mapping (es:foobar) */");
- assert_se(free_and_strdup(&c.x11_variant, "foobar") >= 0);
-
- assert_se(x11_convert_to_vconsole(&c) == 0);
- assert_se(streq(c.vc_keymap, "es"));
-
- log_info("/* test with known variant, new mapping (es:dvorak) */");
- assert_se(free_and_strdup(&c.x11_variant, "dvorak") >= 0);
-
- r = x11_convert_to_vconsole(&c);
- if (r == 0) {
- log_info("Skipping rest of %s: keymaps are not installed", __func__);
- return;
- }
-
- assert_se(r == 1);
- assert_se(streq(c.vc_keymap, "es-dvorak"));
-
- log_info("/* test with old mapping (fr:latin9) */");
- assert_se(free_and_strdup(&c.x11_layout, "fr") >= 0);
- assert_se(free_and_strdup(&c.x11_variant, "latin9") >= 0);
-
- assert_se(x11_convert_to_vconsole(&c) == 1);
- assert_se(streq(c.vc_keymap, "fr-latin9"));
-
- log_info("/* test with a compound mapping (us,ru:) */");
- assert_se(free_and_strdup(&c.x11_layout, "us,ru") >= 0);
- assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
-
- assert_se(x11_convert_to_vconsole(&c) == 1);
- assert_se(streq(c.vc_keymap, "us"));
-
- log_info("/* test with a compound mapping (ru,us:) */");
- assert_se(free_and_strdup(&c.x11_layout, "ru,us") >= 0);
- assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
-
- assert_se(x11_convert_to_vconsole(&c) == 1);
- assert_se(streq(c.vc_keymap, "ru"));
-
- /* https://bugzilla.redhat.com/show_bug.cgi?id=1333998 */
- log_info("/* test with a simple new mapping (ru:) */");
- assert_se(free_and_strdup(&c.x11_layout, "ru") >= 0);
- assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
-
- assert_se(x11_convert_to_vconsole(&c) == 0);
- assert_se(streq(c.vc_keymap, "ru"));
-}
-
-int main(int argc, char **argv) {
- log_set_max_level(LOG_DEBUG);
- log_parse_environment();
-
- test_find_language_fallback();
- test_find_converted_keymap();
- test_find_legacy_keymap();
-
- test_vconsole_convert_to_x11();
- test_x11_convert_to_vconsole();
-
- return 0;
-}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-16 22:48:06 +0000