return r;
}
-static int list_locales(DBusConnection *bus, char **args, unsigned n) {
+static int add_locales_from_archive(Set *locales) {
/* Stolen from glibc... */
struct locarhead {
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");
+ if (errno != ENOENT)
+ log_error("Failed to open locale archive: %m");
r = -errno;
goto finish;
}
}
}
- l = set_get_strv(locales);
- if (!l) {
- r = log_oom();
- goto finish;
+ r = 0;
+
+ finish:
+ if (p != MAP_FAILED)
+ munmap((void*) p, sz);
+
+ return r;
+}
+
+static int add_locales_from_libdir (Set *locales) {
+ DIR _cleanup_closedir_ *dir;
+ struct dirent *entry;
+ int r;
+
+ dir = opendir("/usr/lib/locale");
+ if (!dir) {
+ log_error("Failed to open locale directory: %m");
+ return -errno;
}
- set_free(locales);
- locales = NULL;
+ errno = 0;
+ while ((entry = readdir(dir))) {
+ char *z;
- strv_sort(l);
+ if (entry->d_type != DT_DIR)
+ continue;
- pager_open_if_enabled();
+ if (ignore_file(entry->d_name))
+ continue;
- STRV_FOREACH(j, l)
- puts(*j);
+ z = strdup(entry->d_name);
+ if (!z)
+ return log_oom();
- r = 0;
+ r = set_put(locales, z);
+ if (r < 0) {
+ free(z);
-finish:
- if (p != MAP_FAILED)
- munmap((void*) p, sz);
+ if (r != -EEXIST) {
+ log_error("Failed to add locale: %s", strerror(-r));
+ return r;
+ }
+ }
- set_free_free(locales);
+ errno = 0;
+ }
- return r;
+ if (errno != 0) {
+ log_error("Failed to read locale directory: %m");
+ return -errno;
+ }
+
+ return 0;
+}
+
+static int list_locales(DBusConnection *bus, char **args, unsigned n) {
+ _cleanup_set_free_ Set *locales;
+ _cleanup_strv_free_ char **l = NULL;
+ int r;
+
+ locales = set_new(string_hash_func, string_compare_func);
+ if (!locales)
+ return log_oom();
+
+ r = add_locales_from_archive(locales);
+ if (r < 0 && r != -ENOENT)
+ return r;
+
+ r = add_locales_from_libdir(locales);
+ if (r < 0)
+ return r;
+
+ l = set_get_strv(locales);
+ if (!l)
+ return log_oom();
+
+ strv_sort(l);
+
+ pager_open_if_enabled();
+
+ strv_print(l);
+
+ return 0;
}
static int set_vconsole_keymap(DBusConnection *bus, char **args, unsigned n) {
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)
pager_open_if_enabled();
- STRV_FOREACH(i, l)
- puts(*i);
-
+ strv_print(l);
return 0;
}
static int help(void) {
printf("%s [OPTIONS...] COMMAND ...\n\n"
- "Query or change system time and date settings.\n\n"
+ "Query or change system locale and keyboard settings.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-convert Don't convert keyboard mappings\n"