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
-rwxr-xr-xsrc/locale/generate-kbd-model-map33
-rw-r--r--src/locale/kbd-model-map72
-rw-r--r--src/locale/localectl.c781
-rw-r--r--src/locale/localed.c1417
-rw-r--r--src/locale/org.freedesktop.locale1.conf27
-rw-r--r--src/locale/org.freedesktop.locale1.policy.in39
-rw-r--r--src/locale/org.freedesktop.locale1.service12
9 files changed, 0 insertions, 2383 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/generate-kbd-model-map b/src/locale/generate-kbd-model-map
deleted file mode 100755
index 624c5179fa..0000000000
--- a/src/locale/generate-kbd-model-map
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import system_config_keyboard.keyboard_models
-
-def strdash(s):
- return s.strip() or '-'
-
-def tab_extend(s, n=1):
- s = strdash(s)
- k = len(s) // 8
-
- if k >= n:
- f = 1
- else:
- f = n - k
-
- return s + '\t'*f
-
-
-models = system_config_keyboard.keyboard_models.KeyboardModels().get_models()
-
-print "# Generated from system-config-keyboard's model list"
-print "# consolelayout\t\txlayout\txmodel\t\txvariant\txoptions"
-
-for key, value in reversed(models.items()):
- options = "terminate:ctrl_alt_bksp"
- if value[4]:
- options += ',' + value[4]
-
- print ''.join((tab_extend(key, 3), tab_extend(value[1]),
- tab_extend(value[2], 2), tab_extend(value[3], 2),
- options))
diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
deleted file mode 100644
index a895880269..0000000000
--- a/src/locale/kbd-model-map
+++ /dev/null
@@ -1,72 +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 mkd,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-trq tr pc105 - terminate:ctrl_alt_bksp
-guj in,us pc105 guj terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-uk gb pc105 - terminate:ctrl_alt_bksp
-is-latin1 is pc105 - terminate:ctrl_alt_bksp
-de de pc105 - terminate:ctrl_alt_bksp
-gur gur,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-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
-tml-inscript in,us pc105 tam terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-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
-ben-probhat in,us pc105 ben_probhat terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-fi-latin1 fi 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
-tml-uni in,us pc105 tam_TAB terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-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
-ar-digits ara,us pc105 digits 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 tj pc105 - terminate:ctrl_alt_bksp
-ar-qwerty ara,us pc105 qwerty terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-ar-azerty-digits ara,us pc105 azerty_digits terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-ben in,us pc105 ben terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-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
-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
-ar-azerty ara,us pc105 azerty terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-ar-qwerty-digits ara,us pc105 qwerty_digits terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-et ee pc105 - terminate:ctrl_alt_bksp
-sk-qwerty sk pc105 - terminate:ctrl_alt_bksp,qwerty
-dev dev,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
-fr-latin9 fr pc105 latin9 terminate:ctrl_alt_bksp
-fr_CH-latin1 ch pc105 fr terminate:ctrl_alt_bksp
-cf ca(fr) 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
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
deleted file mode 100644
index fa73bcaac6..0000000000
--- a/src/locale/localectl.c
+++ /dev/null
@@ -1,781 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2012 Lennart Poettering
-
- 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.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <string.h>
-#include <ftw.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-
-#include "dbus-common.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"
-
-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 bool arg_convert = true;
-
-static void pager_open_if_enabled(void) {
-
- if (arg_no_pager)
- return;
-
- pager_open();
-}
-
-static void polkit_agent_open_if_enabled(void) {
-
- /* Open the polkit agent as a child process if necessary */
-
- if (!arg_ask_password)
- return;
-
- polkit_agent_open();
-}
-
-typedef struct StatusInfo {
- char **locale;
- const char *vconsole_keymap;
- const char *vconsole_keymap_toggle;
- const char *x11_layout;
- const char *x11_model;
- const char *x11_variant;
- const char *x11_options;
-} StatusInfo;
-
-static void print_status_info(StatusInfo *i) {
- assert(i);
-
- if (strv_isempty(i->locale))
- puts(" System Locale: n/a\n");
- 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 status_property(const char *name, DBusMessageIter *iter, StatusInfo *i) {
- int r;
-
- assert(name);
- assert(iter);
-
- switch (dbus_message_iter_get_arg_type(iter)) {
-
- case DBUS_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;
- }
- break;
- }
-
- case DBUS_TYPE_ARRAY:
-
- if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRING) {
- char **l;
-
- r = bus_parse_strv_iter(iter, &l);
- if (r < 0)
- return r;
-
- if (streq(name, "Locale")) {
- strv_free(i->locale);
- i->locale = l;
- l = NULL;
- }
-
- strv_free(l);
- }
- }
-
- return 0;
-}
-
-static int show_status(DBusConnection *bus, char **args, unsigned n) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- const char *interface = "";
- int r;
- DBusMessageIter iter, sub, sub2, sub3;
- StatusInfo info;
-
- assert(args);
-
- r = bus_method_call_with_reply(
- bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.DBus.Properties",
- "GetAll",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &interface,
- DBUS_TYPE_INVALID);
- if (r < 0)
- 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);
-
- while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
- const char *name;
-
- 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);
-
- 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;
- }
-
- dbus_message_iter_recurse(&sub2, &sub3);
-
- r = status_property(name, &sub3, &info);
- if (r < 0) {
- log_error("Failed to parse reply.");
- return r;
- }
-
- dbus_message_iter_next(&sub);
- }
-
- print_status_info(&info);
- strv_free(info.locale);
- return 0;
-}
-
-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;
- int r;
-
- assert(bus);
- assert(args);
-
- dbus_error_init(&error);
-
- polkit_agent_open_if_enabled();
-
- m = dbus_message_new_method_call(
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "SetLocale");
- if (!m)
- return log_oom();
-
- dbus_message_iter_init_append(m, &iter);
-
- r = bus_append_strv_iter(&iter, args + 1);
- if (r < 0)
- return log_oom();
-
- if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &interactive))
- return log_oom();
-
- 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 = 0;
-
-finish:
- dbus_error_free(&error);
- return r;
-}
-
-static int list_locales(DBusConnection *bus, char **args, unsigned n) {
- /* 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;
- _cleanup_strv_free_ char **l = NULL;
- char **j;
- Set *locales;
- size_t sz = 0;
- struct stat st;
- unsigned i;
- int r;
-
- locales = set_new(string_hash_func, string_compare_func);
- if (!locales)
- return log_oom();
-
- fd = open("/usr/lib/locale/locale-archive", O_RDONLY|O_NOCTTY|O_CLOEXEC);
- if (fd < 0) {
- 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;
-
- z = strdup((char*) p + e[i].name_offset);
- if (!z) {
- r = log_oom();
- goto finish;
- }
-
- r = set_put(locales, z);
- if (r < 0) {
- free(z);
- log_error("Failed to add locale: %s", strerror(-r));
- goto finish;
- }
- }
-
- l = set_get_strv(locales);
- if (!l) {
- r = log_oom();
- goto finish;
- }
-
- set_free(locales);
- locales = NULL;
-
- strv_sort(l);
-
- pager_open_if_enabled();
-
- STRV_FOREACH(j, l)
- puts(*j);
-
- r = 0;
-
-finish:
- if (p != MAP_FAILED)
- munmap((void*) p, sz);
-
- set_free_free(locales);
-
- return r;
-}
-
-static int set_vconsole_keymap(DBusConnection *bus, char **args, unsigned n) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- dbus_bool_t interactive = true, b;
- const char *map, *toggle_map;
-
- 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] : "";
- b = arg_convert;
-
- return bus_method_call_with_reply(
- bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "SetVConsoleKeyboard",
- &reply,
- NULL,
- DBUS_TYPE_STRING, &map,
- DBUS_TYPE_STRING, &toggle_map,
- DBUS_TYPE_BOOLEAN, &b,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID);
-}
-
-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(path_get_file_name(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_put(keymaps, p);
- if (r == -EEXIST)
- free(p);
- else if (r < 0) {
- 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;
-
- keymaps = set_new(string_hash_func, string_compare_func);
- if (!keymaps)
- return log_oom();
-
- 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);
-
- 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_if_enabled();
-
- STRV_FOREACH(i, l)
- puts(*i);
-
-
- 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;
- const char *layout, *model, *variant, *options;
-
- 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 > 3 ? args[4] : "";
- b = arg_convert;
-
- return bus_method_call_with_reply(
- bus,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "SetX11Keyboard",
- &reply,
- 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);
-}
-
-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"
- "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"
- " set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]\n"
- " Set X11 keyboard mapping\n",
- program_invocation_short_name);
-
- return 0;
-}
-
-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' },
- { "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 }
- };
-
- int c;
-
- assert(argc >= 0);
- assert(argv);
-
- while ((c = getopt_long(argc, argv, "has:H:P", options, NULL)) >= 0) {
-
- switch (c) {
-
- case 'h':
- help();
- return 0;
-
- case ARG_VERSION:
- puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
- 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;
-
- case ARG_NO_PAGER:
- arg_no_pager = true;
- break;
-
- case '?':
- return -EINVAL;
-
- default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
- }
- }
-
- return 1;
-}
-
-static int localectl_main(DBusConnection *bus, int argc, char *argv[], DBusError *error) {
-
- static const struct {
- const char* verb;
- const enum {
- MORE,
- LESS,
- EQUAL
- } argc_cmp;
- const int argc;
- int (* const dispatch)(DBusConnection *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 },
- };
-
- int left;
- unsigned i;
-
- assert(argc >= 0);
- assert(argv);
- assert(error);
-
- 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.");
- }
-
- 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);
-
- setlocale(LC_ALL, "");
- log_parse_environment();
- log_open();
-
- r = parse_argv(argc, argv);
- if (r < 0)
- goto finish;
- else if (r == 0) {
- retval = 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);
- }
-
- dbus_error_free(&error);
- dbus_shutdown();
-
- pager_close();
-
- return retval;
-}
diff --git a/src/locale/localed.c b/src/locale/localed.c
deleted file mode 100644
index 04268a1982..0000000000
--- a/src/locale/localed.c
+++ /dev/null
@@ -1,1417 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- 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 <dbus/dbus.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "util.h"
-#include "mkdir.h"
-#include "strv.h"
-#include "dbus-common.h"
-#include "polkit.h"
-#include "def.h"
-
-#define INTERFACE \
- " <interface name=\"org.freedesktop.locale1\">\n" \
- " <property name=\"Locale\" type=\"as\" access=\"read\"/>\n" \
- " <property name=\"VConsoleKeymap\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"VConsoleKeymapToggle\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"X11Layout\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"X11Model\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"X11Variant\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"X11Options\" type=\"s\" access=\"read\"/>\n" \
- " <method name=\"SetLocale\">\n" \
- " <arg name=\"locale\" type=\"as\" direction=\"in\"/>\n" \
- " <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
- " </method>\n" \
- " <method name=\"SetVConsoleKeyboard\">\n" \
- " <arg name=\"keymap\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"keymap_toggle\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"convert\" type=\"b\" direction=\"in\"/>\n" \
- " <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
- " </method>\n" \
- " <method name=\"SetX11Keyboard\">\n" \
- " <arg name=\"layout\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"model\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"variant\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"options\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"convert\" type=\"b\" direction=\"in\"/>\n" \
- " <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
- " </method>\n" \
- " </interface>\n"
-
-#define INTROSPECTION \
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
- "<node>\n" \
- INTERFACE \
- BUS_PROPERTIES_INTERFACE \
- BUS_INTROSPECTABLE_INTERFACE \
- BUS_PEER_INTERFACE \
- "</node>\n"
-
-#define INTERFACES_LIST \
- BUS_GENERIC_INTERFACES_LIST \
- "org.freedesktop.locale1\0"
-
-const char locale_interface[] _introspect_("locale1") = INTERFACE;
-
-enum {
- /* We don't list LC_ALL here on purpose. People should be
- * using LANG instead. */
-
- PROP_LANG,
- PROP_LANGUAGE,
- PROP_LC_CTYPE,
- PROP_LC_NUMERIC,
- PROP_LC_TIME,
- PROP_LC_COLLATE,
- PROP_LC_MONETARY,
- PROP_LC_MESSAGES,
- PROP_LC_PAPER,
- PROP_LC_NAME,
- PROP_LC_ADDRESS,
- PROP_LC_TELEPHONE,
- PROP_LC_MEASUREMENT,
- PROP_LC_IDENTIFICATION,
- _PROP_MAX
-};
-
-static const char * const names[_PROP_MAX] = {
- [PROP_LANG] = "LANG",
- [PROP_LANGUAGE] = "LANGUAGE",
- [PROP_LC_CTYPE] = "LC_CTYPE",
- [PROP_LC_NUMERIC] = "LC_NUMERIC",
- [PROP_LC_TIME] = "LC_TIME",
- [PROP_LC_COLLATE] = "LC_COLLATE",
- [PROP_LC_MONETARY] = "LC_MONETARY",
- [PROP_LC_MESSAGES] = "LC_MESSAGES",
- [PROP_LC_PAPER] = "LC_PAPER",
- [PROP_LC_NAME] = "LC_NAME",
- [PROP_LC_ADDRESS] = "LC_ADDRESS",
- [PROP_LC_TELEPHONE] = "LC_TELEPHONE",
- [PROP_LC_MEASUREMENT] = "LC_MEASUREMENT",
- [PROP_LC_IDENTIFICATION] = "LC_IDENTIFICATION"
-};
-
-static char *data[_PROP_MAX] = {
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
-};
-
-typedef struct State {
- char *x11_layout, *x11_model, *x11_variant, *x11_options;
- char *vc_keymap, *vc_keymap_toggle;
-} State;
-
-static State state;
-
-static usec_t remain_until = 0;
-
-static int free_and_set(char **s, const char *v) {
- int r;
- char *t;
-
- assert(s);
-
- r = strdup_or_null(isempty(v) ? NULL : v, &t);
- if (r < 0)
- return r;
-
- free(*s);
- *s = t;
-
- return 0;
-}
-
-static void free_data_locale(void) {
- int p;
-
- for (p = 0; p < _PROP_MAX; p++) {
- free(data[p]);
- data[p] = NULL;
- }
-}
-
-static void free_data_x11(void) {
- free(state.x11_layout);
- free(state.x11_model);
- free(state.x11_variant);
- free(state.x11_options);
-
- state.x11_layout = state.x11_model = state.x11_variant = state.x11_options = NULL;
-}
-
-static void free_data_vconsole(void) {
- free(state.vc_keymap);
- free(state.vc_keymap_toggle);
-
- state.vc_keymap = state.vc_keymap_toggle = NULL;
-}
-
-static void simplify(void) {
- int p;
-
- for (p = 1; p < _PROP_MAX; p++)
- if (isempty(data[p]) || streq_ptr(data[PROP_LANG], data[p])) {
- free(data[p]);
- data[p] = NULL;
- }
-}
-
-static int read_data_locale(void) {
- int r;
-
- free_data_locale();
-
- r = parse_env_file("/etc/locale.conf", NEWLINE,
- "LANG", &data[PROP_LANG],
- "LANGUAGE", &data[PROP_LANGUAGE],
- "LC_CTYPE", &data[PROP_LC_CTYPE],
- "LC_NUMERIC", &data[PROP_LC_NUMERIC],
- "LC_TIME", &data[PROP_LC_TIME],
- "LC_COLLATE", &data[PROP_LC_COLLATE],
- "LC_MONETARY", &data[PROP_LC_MONETARY],
- "LC_MESSAGES", &data[PROP_LC_MESSAGES],
- "LC_PAPER", &data[PROP_LC_PAPER],
- "LC_NAME", &data[PROP_LC_NAME],
- "LC_ADDRESS", &data[PROP_LC_ADDRESS],
- "LC_TELEPHONE", &data[PROP_LC_TELEPHONE],
- "LC_MEASUREMENT", &data[PROP_LC_MEASUREMENT],
- "LC_IDENTIFICATION", &data[PROP_LC_IDENTIFICATION],
- NULL);
-
- if (r == -ENOENT) {
- int p;
-
- /* Fill in what we got passed from systemd. */
-
- for (p = 0; p < _PROP_MAX; p++) {
- char *e, *d;
-
- assert(names[p]);
-
- e = getenv(names[p]);
- if (e) {
- d = strdup(e);
- if (!d)
- return -ENOMEM;
- } else
- d = NULL;
-
- free(data[p]);
- data[p] = d;
- }
-
- r = 0;
- }
-
- simplify();
- return r;
-}
-
-static void free_data(void) {
- free_data_locale();
- free_data_vconsole();
- free_data_x11();
-}
-
-static int read_data_vconsole(void) {
- int r;
-
- free_data_vconsole();
-
- r = parse_env_file("/etc/vconsole.conf", NEWLINE,
- "KEYMAP", &state.vc_keymap,
- "KEYMAP_TOGGLE", &state.vc_keymap_toggle,
- NULL);
-
- if (r < 0 && r != -ENOENT)
- return r;
-
- return 0;
-}
-
-static int read_data_x11(void) {
- FILE *f;
- char line[LINE_MAX];
- bool in_section = false;
-
- free_data_x11();
-
- 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")) {
- char **a;
-
- a = strv_split_quoted(l);
- if (!a) {
- fclose(f);
- return -ENOMEM;
- }
-
- if (strv_length(a) == 3) {
-
- if (streq(a[1], "XkbLayout")) {
- free(state.x11_layout);
- state.x11_layout = a[2];
- a[2] = NULL;
- } else if (streq(a[1], "XkbModel")) {
- free(state.x11_model);
- state.x11_model = a[2];
- a[2] = NULL;
- } else if (streq(a[1], "XkbVariant")) {
- free(state.x11_variant);
- state.x11_variant = a[2];
- a[2] = NULL;
- } else if (streq(a[1], "XkbOptions")) {
- free(state.x11_options);
- state.x11_options = a[2];
- a[2] = NULL;
- }
- }
-
- strv_free(a);
-
- } else if (!in_section && first_word(l, "Section")) {
- char **a;
-
- a = strv_split_quoted(l);
- if (!a) {
- fclose(f);
- return -ENOMEM;
- }
-
- if (strv_length(a) == 2 && streq(a[1], "InputClass"))
- in_section = true;
-
- strv_free(a);
- } else if (in_section && first_word(l, "EndSection"))
- in_section = false;
- }
-
- fclose(f);
-
- return 0;
-}
-
-static int read_data(void) {
- int r, q, p;
-
- r = read_data_locale();
- q = read_data_vconsole();
- p = read_data_x11();
-
- return r < 0 ? r : q < 0 ? q : p;
-}
-
-static int write_data_locale(void) {
- int r, p;
- char **l = NULL;
-
- r = load_env_file("/etc/locale.conf", &l);
- if (r < 0 && r != -ENOENT)
- return r;
-
- for (p = 0; p < _PROP_MAX; p++) {
- char *t, **u;
-
- assert(names[p]);
-
- if (isempty(data[p])) {
- l = strv_env_unset(l, names[p]);
- continue;
- }
-
- if (asprintf(&t, "%s=%s", names[p], data[p]) < 0) {
- strv_free(l);
- return -ENOMEM;
- }
-
- u = strv_env_set(l, t);
- free(t);
- strv_free(l);
-
- if (!u)
- return -ENOMEM;
-
- l = u;
- }
-
- if (strv_isempty(l)) {
- strv_free(l);
-
- if (unlink("/etc/locale.conf") < 0)
- return errno == ENOENT ? 0 : -errno;
-
- return 0;
- }
-
- r = write_env_file("/etc/locale.conf", l);
- strv_free(l);
-
- return r;
-}
-
-static void push_data(DBusConnection *bus) {
- char **l_set = NULL, **l_unset = NULL, **t;
- int c_set = 0, c_unset = 0, p;
- DBusError error;
- DBusMessage *m = NULL, *reply = NULL;
- DBusMessageIter iter, sub;
-
- dbus_error_init(&error);
-
- assert(bus);
-
- l_set = new0(char*, _PROP_MAX);
- l_unset = new0(char*, _PROP_MAX);
- if (!l_set || !l_unset) {
- log_oom();
- goto finish;
- }
-
- for (p = 0; p < _PROP_MAX; p++) {
- assert(names[p]);
-
- if (isempty(data[p]))
- l_unset[c_set++] = (char*) names[p];
- else {
- char *s;
-
- if (asprintf(&s, "%s=%s", names[p], data[p]) < 0) {
- log_oom();
- goto finish;
- }
-
- l_set[c_unset++] = s;
- }
- }
-
- assert(c_set + c_unset == _PROP_MAX);
- m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "UnsetAndSetEnvironment");
- if (!m) {
- log_error("Could not allocate message.");
- goto finish;
- }
-
- dbus_message_iter_init_append(m, &iter);
-
- if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {
- log_oom();
- goto finish;
- }
-
- STRV_FOREACH(t, l_unset)
- if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {
- log_oom();
- goto finish;
- }
-
- if (!dbus_message_iter_close_container(&iter, &sub) ||
- !dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {
- log_oom();
- goto finish;
- }
-
- STRV_FOREACH(t, l_set)
- if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {
- log_oom();
- goto finish;
- }
-
- if (!dbus_message_iter_close_container(&iter, &sub)) {
- log_oom();
- goto finish;
- }
-
- reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
- if (!reply) {
- log_error("Failed to set locale information: %s", bus_error_message(&error));
- goto finish;
- }
-
-finish:
- if (m)
- dbus_message_unref(m);
-
- if (reply)
- dbus_message_unref(reply);
-
- dbus_error_free(&error);
-
- strv_free(l_set);
- free(l_unset);
-}
-
-static int write_data_vconsole(void) {
- int r;
- char **l = NULL;
-
- r = load_env_file("/etc/vconsole.conf", &l);
- if (r < 0 && r != -ENOENT)
- return r;
-
- if (isempty(state.vc_keymap))
- l = strv_env_unset(l, "KEYMAP");
- else {
- char *s, **u;
-
- s = strappend("KEYMAP=", state.vc_keymap);
- if (!s) {
- strv_free(l);
- return -ENOMEM;
- }
-
- u = strv_env_set(l, s);
- free(s);
- strv_free(l);
-
- if (!u)
- return -ENOMEM;
-
- l = u;
- }
-
- if (isempty(state.vc_keymap_toggle))
- l = strv_env_unset(l, "KEYMAP_TOGGLE");
- else {
- char *s, **u;
-
- s = strappend("KEYMAP_TOGGLE=", state.vc_keymap_toggle);
- if (!s) {
- strv_free(l);
- return -ENOMEM;
- }
-
- u = strv_env_set(l, s);
- free(s);
- strv_free(l);
-
- if (!u)
- return -ENOMEM;
-
- l = u;
- }
-
- if (strv_isempty(l)) {
- strv_free(l);
-
- if (unlink("/etc/vconsole.conf") < 0)
- return errno == ENOENT ? 0 : -errno;
-
- return 0;
- }
-
- r = write_env_file("/etc/vconsole.conf", l);
- strv_free(l);
-
- return r;
-}
-
-static int write_data_x11(void) {
- FILE *f;
- char *temp_path;
- int r;
-
- if (isempty(state.x11_layout) &&
- isempty(state.x11_model) &&
- isempty(state.x11_variant) &&
- isempty(state.x11_options)) {
-
- if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
- return errno == ENOENT ? 0 : -errno;
-
- return 0;
- }
-
- mkdir_parents_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(state.x11_layout))
- fprintf(f, " Option \"XkbLayout\" \"%s\"\n", state.x11_layout);
-
- if (!isempty(state.x11_model))
- fprintf(f, " Option \"XkbModel\" \"%s\"\n", state.x11_model);
-
- if (!isempty(state.x11_variant))
- fprintf(f, " Option \"XkbVariant\" \"%s\"\n", state.x11_variant);
-
- if (!isempty(state.x11_options))
- fprintf(f, " Option \"XkbOptions\" \"%s\"\n", state.x11_options);
-
- fputs("EndSection\n", f);
- fflush(f);
-
- if (ferror(f) || rename(temp_path, "/etc/X11/xorg.conf.d/00-keyboard.conf") < 0) {
- r = -errno;
- unlink("/etc/X11/xorg.conf.d/00-keyboard.conf");
- unlink(temp_path);
- } else
- r = 0;
-
- fclose(f);
- free(temp_path);
-
- return r;
-}
-
-static int load_vconsole_keymap(DBusConnection *bus, DBusError *error) {
- DBusMessage *m = NULL, *reply = NULL;
- const char *name = "systemd-vconsole-setup.service", *mode = "replace";
- int r;
- DBusError _error;
-
- assert(bus);
-
- if (!error) {
- dbus_error_init(&_error);
- error = &_error;
- }
-
- m = dbus_message_new_method_call(
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "RestartUnit");
- if (!m) {
- log_error("Could not allocate message.");
- r = -ENOMEM;
- goto finish;
- }
-
- if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_STRING, &mode,
- DBUS_TYPE_INVALID)) {
- log_error("Could not append arguments to message.");
- r = -ENOMEM;
- goto finish;
- }
-
- 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 = 0;
-
-finish:
- if (m)
- dbus_message_unref(m);
-
- if (reply)
- dbus_message_unref(reply);
-
- if (error == &_error)
- dbus_error_free(error);
-
- return r;
-}
-
-static char *strnulldash(const char *s) {
- return s == NULL || *s == 0 || (s[0] == '-' && s[1] == 0) ? NULL : (char*) s;
-}
-
-static int read_next_mapping(FILE *f, unsigned *n, char ***a) {
- assert(f);
- assert(n);
- assert(a);
-
- for (;;) {
- char line[LINE_MAX];
- char *l, **b;
-
- errno = 0;
- if (!fgets(line, sizeof(line), f)) {
-
- if (ferror(f))
- return errno ? -errno : -EIO;
-
- return 0;
- }
-
- (*n) ++;
-
- l = strstrip(line);
- if (l[0] == 0 || l[0] == '#')
- continue;
-
- b = strv_split_quoted(l);
- if (!b)
- return -ENOMEM;
-
- if (strv_length(b) < 5) {
- log_error("Invalid line "SYSTEMD_KBD_MODEL_MAP":%u, ignoring.", *n);
- strv_free(b);
- continue;
-
- }
-
- *a = b;
- return 1;
- }
-}
-
-static int convert_vconsole_to_x11(DBusConnection *connection) {
- bool modified = false;
-
- assert(connection);
-
- if (isempty(state.vc_keymap)) {
-
- modified =
- !isempty(state.x11_layout) ||
- !isempty(state.x11_model) ||
- !isempty(state.x11_variant) ||
- !isempty(state.x11_options);
-
- free_data_x11();
- } else {
- FILE *f;
- unsigned n = 0;
-
- f = fopen(SYSTEMD_KBD_MODEL_MAP, "re");
- if (!f)
- return -errno;
-
- for (;;) {
- char **a;
- int r;
-
- r = read_next_mapping(f, &n, &a);
- if (r < 0) {
- fclose(f);
- return r;
- }
-
- if (r == 0)
- break;
-
- if (!streq(state.vc_keymap, a[0])) {
- strv_free(a);
- continue;
- }
-
- if (!streq_ptr(state.x11_layout, strnulldash(a[1])) ||
- !streq_ptr(state.x11_model, strnulldash(a[2])) ||
- !streq_ptr(state.x11_variant, strnulldash(a[3])) ||
- !streq_ptr(state.x11_options, strnulldash(a[4]))) {
-
- if (free_and_set(&state.x11_layout, strnulldash(a[1])) < 0 ||
- free_and_set(&state.x11_model, strnulldash(a[2])) < 0 ||
- free_and_set(&state.x11_variant, strnulldash(a[3])) < 0 ||
- free_and_set(&state.x11_options, strnulldash(a[4])) < 0) {
- strv_free(a);
- fclose(f);
- return -ENOMEM;
- }
-
- modified = true;
- }
-
- strv_free(a);
- break;
- }
-
- fclose(f);
- }
-
- if (modified) {
- dbus_bool_t b;
- DBusMessage *changed;
- int r;
-
- r = write_data_x11();
- if (r < 0)
- log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
-
- changed = bus_properties_changed_new(
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "X11Layout\0"
- "X11Model\0"
- "X11Variant\0"
- "X11Options\0");
-
- if (!changed)
- return -ENOMEM;
-
- b = dbus_connection_send(connection, changed, NULL);
- dbus_message_unref(changed);
-
- if (!b)
- return -ENOMEM;
- }
-
- return 0;
-}
-
-static int convert_x11_to_vconsole(DBusConnection *connection) {
- bool modified = false;
-
- assert(connection);
-
- if (isempty(state.x11_layout)) {
-
- modified =
- !isempty(state.vc_keymap) ||
- !isempty(state.vc_keymap_toggle);
-
- free_data_x11();
- } else {
- FILE *f;
- unsigned n = 0;
- unsigned best_matching = 0;
- char *new_keymap = NULL;
-
- f = fopen(SYSTEMD_KBD_MODEL_MAP, "re");
- if (!f)
- return -errno;
-
- for (;;) {
- char **a;
- unsigned matching = 0;
- int r;
-
- r = read_next_mapping(f, &n, &a);
- if (r < 0) {
- fclose(f);
- return r;
- }
-
- if (r == 0)
- break;
-
- /* Determine how well matching this entry is */
- if (streq_ptr(state.x11_layout, a[1]))
- /* If we got an exact match, this is best */
- matching = 10;
- else {
- size_t x;
-
- x = strcspn(state.x11_layout, ",");
-
- /* We have multiple X layouts, look
- * for an entry that matches our key
- * with the everything but the first
- * layout stripped off. */
- if (x > 0 &&
- strlen(a[1]) == x &&
- strncmp(state.x11_layout, a[1], x) == 0)
- matching = 5;
- else {
- size_t w;
-
- /* If that didn't work, strip
- * off the other layouts from
- * the entry, too */
-
- w = strcspn(a[1], ",");
-
- if (x > 0 && x == w &&
- memcmp(state.x11_layout, a[1], x) == 0)
- matching = 1;
- }
- }
-
- if (matching > 0 &&
- streq_ptr(state.x11_model, a[2])) {
- matching++;
-
- if (streq_ptr(state.x11_variant, a[3])) {
- matching++;
-
- if (streq_ptr(state.x11_options, a[4]))
- matching++;
- }
- }
-
- /* The best matching entry so far, then let's
- * save that */
- if (matching > best_matching) {
- best_matching = matching;
-
- free(new_keymap);
- new_keymap = strdup(a[0]);
-
- if (!new_keymap) {
- strv_free(a);
- fclose(f);
- return -ENOMEM;
- }
- }
-
- strv_free(a);
- }
-
- fclose(f);
-
- if (!streq_ptr(state.vc_keymap, new_keymap)) {
- free(state.vc_keymap);
- state.vc_keymap = new_keymap;
-
- free(state.vc_keymap_toggle);
- state.vc_keymap_toggle = NULL;
-
- modified = true;
- } else
- free(new_keymap);
- }
-
- if (modified) {
- dbus_bool_t b;
- DBusMessage *changed;
- int r;
-
- r = write_data_vconsole();
- if (r < 0)
- log_error("Failed to set virtual console keymap: %s", strerror(-r));
-
- changed = bus_properties_changed_new(
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "VConsoleKeymap\0"
- "VConsoleKeymapToggle\0");
-
- if (!changed)
- return -ENOMEM;
-
- b = dbus_connection_send(connection, changed, NULL);
- dbus_message_unref(changed);
-
- if (!b)
- return -ENOMEM;
-
- return load_vconsole_keymap(connection, NULL);
- }
-
- return 0;
-}
-
-static int append_locale(DBusMessageIter *i, const char *property, void *userdata) {
- int r, c = 0, p;
- char **l;
-
- l = new0(char*, _PROP_MAX+1);
- if (!l)
- return -ENOMEM;
-
- for (p = 0; p < _PROP_MAX; p++) {
- char *t;
-
- if (isempty(data[p]))
- continue;
-
- if (asprintf(&t, "%s=%s", names[p], data[p]) < 0) {
- strv_free(l);
- return -ENOMEM;
- }
-
- l[c++] = t;
- }
-
- r = bus_property_append_strv(i, property, (void*) l);
- strv_free(l);
-
- return r;
-}
-
-static const BusProperty bus_locale_properties[] = {
- { "Locale", append_locale, "as", 0 },
- { "X11Layout", bus_property_append_string, "s", offsetof(State, x11_layout), true },
- { "X11Model", bus_property_append_string, "s", offsetof(State, x11_model), true },
- { "X11Variant", bus_property_append_string, "s", offsetof(State, x11_variant), true },
- { "X11Options", bus_property_append_string, "s", offsetof(State, x11_options), true },
- { "VConsoleKeymap", bus_property_append_string, "s", offsetof(State, vc_keymap), true },
- { "VConsoleKeymapToggle", bus_property_append_string, "s", offsetof(State, vc_keymap_toggle), true },
- { NULL, }
-};
-
-static const BusBoundProperties bps[] = {
- { "org.freedesktop.locale1", bus_locale_properties, &state },
- { NULL, }
-};
-
-static DBusHandlerResult locale_message_handler(
- DBusConnection *connection,
- DBusMessage *message,
- void *userdata) {
-
- DBusMessage *reply = NULL, *changed = NULL;
- DBusError error;
- int r;
-
- assert(connection);
- assert(message);
-
- dbus_error_init(&error);
-
- if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetLocale")) {
- char **l = NULL, **i;
- dbus_bool_t interactive;
- DBusMessageIter iter;
- bool modified = false;
- bool passed[_PROP_MAX];
- int p;
-
- if (!dbus_message_iter_init(message, &iter))
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
-
- r = bus_parse_strv_iter(&iter, &l);
- if (r < 0) {
- if (r == -ENOMEM)
- goto oom;
-
- return bus_send_error_reply(connection, message, NULL, r);
- }
-
- if (!dbus_message_iter_next(&iter) ||
- dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) {
- strv_free(l);
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
- }
-
- dbus_message_iter_get_basic(&iter, &interactive);
-
- zero(passed);
-
- /* Check whether a variable changed and if so valid */
- STRV_FOREACH(i, l) {
- bool valid = false;
-
- for (p = 0; p < _PROP_MAX; p++) {
- size_t k;
-
- k = strlen(names[p]);
- if (startswith(*i, names[p]) &&
- (*i)[k] == '=' &&
- string_is_safe((*i) + k + 1)) {
- valid = true;
- passed[p] = true;
-
- if (!streq_ptr(*i + k + 1, data[p]))
- modified = true;
-
- break;
- }
- }
-
- if (!valid) {
- strv_free(l);
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
- }
- }
-
- /* Check whether a variable is unset */
- if (!modified) {
- for (p = 0; p < _PROP_MAX; p++)
- if (!isempty(data[p]) && !passed[p]) {
- modified = true;
- break;
- }
- }
-
- if (modified) {
-
- r = verify_polkit(connection, message, "org.freedesktop.locale1.set-locale", interactive, NULL, &error);
- if (r < 0) {
- strv_free(l);
- return bus_send_error_reply(connection, message, &error, r);
- }
-
- STRV_FOREACH(i, l) {
- for (p = 0; p < _PROP_MAX; p++) {
- size_t k;
-
- k = strlen(names[p]);
- if (startswith(*i, names[p]) && (*i)[k] == '=') {
- char *t;
-
- t = strdup(*i + k + 1);
- if (!t) {
- strv_free(l);
- goto oom;
- }
-
- free(data[p]);
- data[p] = t;
-
- break;
- }
- }
- }
-
- strv_free(l);
-
- for (p = 0; p < _PROP_MAX; p++) {
- if (passed[p])
- continue;
-
- free(data[p]);
- data[p] = NULL;
- }
-
- simplify();
-
- r = write_data_locale();
- if (r < 0) {
- log_error("Failed to set locale: %s", strerror(-r));
- return bus_send_error_reply(connection, message, NULL, r);
- }
-
- push_data(connection);
-
- log_info("Changed locale information.");
-
- changed = bus_properties_changed_new(
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "Locale\0");
- if (!changed)
- goto oom;
- } else
- strv_free(l);
-
- } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetVConsoleKeyboard")) {
-
- const char *keymap, *keymap_toggle;
- dbus_bool_t convert, interactive;
-
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_STRING, &keymap,
- DBUS_TYPE_STRING, &keymap_toggle,
- DBUS_TYPE_BOOLEAN, &convert,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
-
- if (isempty(keymap))
- keymap = NULL;
-
- if (isempty(keymap_toggle))
- keymap_toggle = NULL;
-
- if (!streq_ptr(keymap, state.vc_keymap) ||
- !streq_ptr(keymap_toggle, state.vc_keymap_toggle)) {
-
- if ((keymap && (!filename_is_safe(keymap) || !string_is_safe(keymap))) ||
- (keymap_toggle && (!filename_is_safe(keymap_toggle) || !string_is_safe(keymap_toggle))))
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
-
- r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- if (free_and_set(&state.vc_keymap, keymap) < 0 ||
- free_and_set(&state.vc_keymap_toggle, keymap_toggle) < 0)
- goto oom;
-
- r = write_data_vconsole();
- if (r < 0) {
- log_error("Failed to set virtual console keymap: %s", strerror(-r));
- return bus_send_error_reply(connection, message, NULL, r);
- }
-
- log_info("Changed virtual console keymap to '%s'", strempty(state.vc_keymap));
-
- r = load_vconsole_keymap(connection, NULL);
- if (r < 0)
- log_error("Failed to request keymap reload: %s", strerror(-r));
-
- changed = bus_properties_changed_new(
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "VConsoleKeymap\0"
- "VConsoleKeymapToggle\0");
- if (!changed)
- goto oom;
-
- if (convert) {
- r = convert_vconsole_to_x11(connection);
-
- if (r < 0)
- log_error("Failed to convert keymap data: %s", strerror(-r));
- }
- }
-
- } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetX11Keyboard")) {
-
- const char *layout, *model, *variant, *options;
- dbus_bool_t convert, interactive;
-
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_STRING, &layout,
- DBUS_TYPE_STRING, &model,
- DBUS_TYPE_STRING, &variant,
- DBUS_TYPE_STRING, &options,
- DBUS_TYPE_BOOLEAN, &convert,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
-
- if (isempty(layout))
- layout = NULL;
-
- if (isempty(model))
- model = NULL;
-
- if (isempty(variant))
- variant = NULL;
-
- if (isempty(options))
- options = NULL;
-
- if (!streq_ptr(layout, state.x11_layout) ||
- !streq_ptr(model, state.x11_model) ||
- !streq_ptr(variant, state.x11_variant) ||
- !streq_ptr(options, state.x11_options)) {
-
- if ((layout && !string_is_safe(layout)) ||
- (model && !string_is_safe(model)) ||
- (variant && !string_is_safe(variant)) ||
- (options && !string_is_safe(options)))
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
-
- r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- if (free_and_set(&state.x11_layout, layout) < 0 ||
- free_and_set(&state.x11_model, model) < 0 ||
- free_and_set(&state.x11_variant, variant) < 0 ||
- free_and_set(&state.x11_options, options) < 0)
- goto oom;
-
- r = write_data_x11();
- if (r < 0) {
- log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
- return bus_send_error_reply(connection, message, NULL, r);
- }
-
- log_info("Changed X11 keyboard layout to '%s'", strempty(state.x11_layout));
-
- changed = bus_properties_changed_new(
- "/org/freedesktop/locale1",
- "org.freedesktop.locale1",
- "X11Layout\0"
- "X11Model\0"
- "X11Variant\0"
- "X11Options\0");
- if (!changed)
- goto oom;
-
- if (convert) {
- r = convert_x11_to_vconsole(connection);
-
- if (r < 0)
- log_error("Failed to convert keymap data: %s", strerror(-r));
- }
- }
- } else
- return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
-
- if (!(reply = dbus_message_new_method_return(message)))
- goto oom;
-
- if (!dbus_connection_send(connection, reply, NULL))
- goto oom;
-
- dbus_message_unref(reply);
- reply = NULL;
-
- if (changed) {
-
- if (!dbus_connection_send(connection, changed, NULL))
- goto oom;
-
- dbus_message_unref(changed);
- }
-
- return DBUS_HANDLER_RESULT_HANDLED;
-
-oom:
- if (reply)
- dbus_message_unref(reply);
-
- if (changed)
- dbus_message_unref(changed);
-
- dbus_error_free(&error);
-
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
-}
-
-static int connect_bus(DBusConnection **_bus) {
- static const DBusObjectPathVTable locale_vtable = {
- .message_function = locale_message_handler
- };
- DBusError error;
- DBusConnection *bus = NULL;
- int r;
-
- assert(_bus);
-
- dbus_error_init(&error);
-
- bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
- if (!bus) {
- log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error));
- r = -ECONNREFUSED;
- goto fail;
- }
-
- dbus_connection_set_exit_on_disconnect(bus, FALSE);
-
- if (!dbus_connection_register_object_path(bus, "/org/freedesktop/locale1", &locale_vtable, NULL) ||
- !dbus_connection_add_filter(bus, bus_exit_idle_filter, &remain_until, NULL)) {
- r = log_oom();
- goto fail;
- }
-
- r = dbus_bus_request_name(bus, "org.freedesktop.locale1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to register name on bus: %s", bus_error_message(&error));
- r = -EEXIST;
- goto fail;
- }
-
- if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- log_error("Failed to acquire name.");
- r = -EEXIST;
- goto fail;
- }
-
- if (_bus)
- *_bus = bus;
-
- return 0;
-
-fail:
- dbus_connection_close(bus);
- dbus_connection_unref(bus);
-
- dbus_error_free(&error);
-
- return r;
-}
-
-int main(int argc, char *argv[]) {
- int r;
- DBusConnection *bus = NULL;
- bool exiting = false;
-
- log_set_target(LOG_TARGET_AUTO);
- log_parse_environment();
- log_open();
-
- umask(0022);
-
- if (argc == 2 && streq(argv[1], "--introspect")) {
- fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
- "<node>\n", stdout);
- fputs(locale_interface, stdout);
- fputs("</node>\n", stdout);
- return 0;
- }
-
- if (argc != 1) {
- log_error("This program takes no arguments.");
- r = -EINVAL;
- goto finish;
- }
-
- r = read_data();
- if (r < 0) {
- log_error("Failed to read locale data: %s", strerror(-r));
- goto finish;
- }
-
- r = connect_bus(&bus);
- if (r < 0)
- goto finish;
-
- remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC;
- for (;;) {
-
- if (!dbus_connection_read_write_dispatch(bus, exiting ? -1 : (int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC)))
- break;
-
- if (!exiting && remain_until < now(CLOCK_MONOTONIC)) {
- exiting = true;
- bus_async_unregister_and_exit(bus, "org.freedesktop.locale1");
- }
- }
-
- r = 0;
-
-finish:
- free_data();
-
- if (bus) {
- dbus_connection_flush(bus);
- dbus_connection_close(bus);
- dbus_connection_unref(bus);
- }
-
- 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 91296c2356..0000000000
--- a/src/locale/org.freedesktop.locale1.policy.in
+++ /dev/null
@@ -1,39 +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>
- </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