summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin-hwdb.c314
-rw-r--r--src/udev/udev-hwdb.h69
-rw-r--r--src/udev/udevadm-hwdb.c39
3 files changed, 59 insertions, 363 deletions
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 14e9edab82..60f647183f 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -2,7 +2,6 @@
This file is part of systemd.
Copyright 2012 Kay Sievers <kay.sievers@vrfy.org>
- Copyright 2008 Alan Jenkins <alan.christopher.jenkins@googlemail.com>
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
@@ -24,210 +23,39 @@
#include <inttypes.h>
#include <ctype.h>
#include <stdlib.h>
-#include <fnmatch.h>
#include <getopt.h>
-#include <sys/mman.h>
#include "udev.h"
-#include "udev-hwdb.h"
-struct linebuf {
- char bytes[LINE_MAX];
- size_t size;
- size_t len;
-};
-
-static void linebuf_init(struct linebuf *buf) {
- buf->size = 0;
- buf->len = 0;
-}
-
-static const char *linebuf_get(struct linebuf *buf) {
- if (buf->len + 1 >= sizeof(buf->bytes))
- return NULL;
- buf->bytes[buf->len] = '\0';
- return buf->bytes;
-}
-
-static bool linebuf_add(struct linebuf *buf, const char *s, size_t len) {
- if (buf->len + len >= sizeof(buf->bytes))
- return false;
- memcpy(buf->bytes + buf->len, s, len);
- buf->len += len;
- return true;
-}
-
-static bool linebuf_add_char(struct linebuf *buf, char c)
-{
- if (buf->len + 1 >= sizeof(buf->bytes))
- return false;
- buf->bytes[buf->len++] = c;
- return true;
-}
-
-static void linebuf_rem(struct linebuf *buf, size_t count) {
- assert(buf->len >= count);
- buf->len -= count;
-}
-
-static void linebuf_rem_char(struct linebuf *buf) {
- linebuf_rem(buf, 1);
-}
+static struct udev_hwdb *hwdb;
-struct trie_f {
- struct udev_device *dev;
- bool test;
- FILE *f;
- uint64_t file_time_usec;
- union {
- struct trie_header_f *head;
- const char *map;
+static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool test) {
+ static const struct option options[] = {
+ { "subsystem", required_argument, NULL, 's' },
+ {}
};
- size_t map_size;
-};
-
-static const struct trie_child_entry_f *trie_node_children(struct trie_f *trie, const struct trie_node_f *node) {
- return (const struct trie_child_entry_f *)((const char *)node + le64toh(trie->head->node_size));
-}
-
-static const struct trie_value_entry_f *trie_node_values(struct trie_f *trie, const struct trie_node_f *node) {
- const char *base = (const char *)node;
-
- base += le64toh(trie->head->node_size);
- base += node->children_count * le64toh(trie->head->child_entry_size);
- return (const struct trie_value_entry_f *)base;
-}
-
-static const struct trie_node_f *trie_node_from_off(struct trie_f *trie, le64_t off) {
- return (const struct trie_node_f *)(trie->map + le64toh(off));
-}
-
-static const char *trie_string(struct trie_f *trie, le64_t off) {
- return trie->map + le64toh(off);
-}
-
-static int trie_children_cmp_f(const void *v1, const void *v2) {
- const struct trie_child_entry_f *n1 = v1;
- const struct trie_child_entry_f *n2 = v2;
-
- return n1->c - n2->c;
-}
-
-static const struct trie_node_f *node_lookup_f(struct trie_f *trie, const struct trie_node_f *node, uint8_t c) {
- struct trie_child_entry_f *child;
- struct trie_child_entry_f search;
-
- search.c = c;
- child = bsearch(&search, trie_node_children(trie, node), node->children_count,
- le64toh(trie->head->child_entry_size), trie_children_cmp_f);
- if (child)
- return trie_node_from_off(trie, child->child_off);
- return NULL;
-}
-
-static void trie_fnmatch_f(struct trie_f *trie, const struct trie_node_f *node, size_t p,
- struct linebuf *buf, const char *search,
- void (*cb)(struct trie_f *trie, const char *key, const char *value)) {
- size_t len;
- size_t i;
- const char *prefix;
-
- prefix = trie_string(trie, node->prefix_off);
- len = strlen(prefix + p);
- linebuf_add(buf, prefix + p, len);
-
- for (i = 0; i < node->children_count; i++) {
- const struct trie_child_entry_f *child = &trie_node_children(trie, node)[i];
-
- linebuf_add_char(buf, child->c);
- trie_fnmatch_f(trie, trie_node_from_off(trie, child->child_off), 0, buf, search, cb);
- linebuf_rem_char(buf);
- }
-
- if (node->values_count && fnmatch(linebuf_get(buf), search, 0) == 0)
- for (i = 0; i < node->values_count; i++)
- cb(trie, trie_string(trie, trie_node_values(trie, node)[i].key_off),
- trie_string(trie, trie_node_values(trie, node)[i].value_off));
-
- linebuf_rem(buf, len);
-}
-
-static void trie_search_f(struct trie_f *trie, const char *search,
- void (*cb)(struct trie_f *trie, const char *key, const char *value)) {
- struct linebuf buf;
- const struct trie_node_f *node;
- size_t i = 0;
-
- linebuf_init(&buf);
-
- node = trie_node_from_off(trie, trie->head->nodes_root_off);
- while (node) {
- const struct trie_node_f *child;
- size_t p = 0;
-
- if (node->prefix_off) {
- uint8_t c;
-
- for (; (c = trie_string(trie, node->prefix_off)[p]); p++) {
- if (c == '*' || c == '?' || c == '[') {
- trie_fnmatch_f(trie, node, p, &buf, search + i + p, cb);
- return;
- }
- if (c != search[i + p])
- return;
- }
- i += p;
- }
-
- child = node_lookup_f(trie, node, '*');
- if (child) {
- linebuf_add_char(&buf, '*');
- trie_fnmatch_f(trie, child, 0, &buf, search + i, cb);
- linebuf_rem_char(&buf);
- }
+ const char *subsys = NULL;
+ struct udev_device *d;
+ const char *modalias;
+ char str[UTIL_NAME_SIZE];
+ struct udev_list_entry *entry;
- child = node_lookup_f(trie, node, '?');
- if (child) {
- linebuf_add_char(&buf, '?');
- trie_fnmatch_f(trie, child, 0, &buf, search + i, cb);
- linebuf_rem_char(&buf);
- }
+ if (!hwdb)
+ return EXIT_FAILURE;
- child = node_lookup_f(trie, node, '[');
- if (child) {
- linebuf_add_char(&buf, '[');
- trie_fnmatch_f(trie, child, 0, &buf, search + i, cb);
- linebuf_rem_char(&buf);
- }
+ for (;;) {
+ int option;
- if (search[i] == '\0') {
- size_t n;
+ option = getopt_long(argc, argv, "s", options, NULL);
+ if (option == -1)
+ break;
- for (n = 0; n < node->values_count; n++)
- cb(trie, trie_string(trie, trie_node_values(trie, node)[n].key_off),
- trie_string(trie, trie_node_values(trie, node)[n].value_off));
- return;
+ switch (option) {
+ case 's':
+ subsys = optarg;
+ break;
}
-
- child = node_lookup_f(trie, node, search[i]);
- node = child;
- i++;
}
-}
-
-static void value_cb(struct trie_f *trie, const char *key, const char *value) {
- /* TODO: add sub-matches (+) against DMI data */
- if (key[0] == ' ')
- udev_builtin_add_property(trie->dev, trie->test, key + 1, value);
-}
-
-static struct trie_f trie;
-
-static int hwdb_lookup(struct udev_device *dev, const char *subsys) {
- struct udev_device *d;
- const char *modalias;
- char str[UTIL_NAME_SIZE];
- int rc = EXIT_SUCCESS;
/* search the first parent device with a modalias */
for (d = dev; d; d = udev_device_get_parent(d)) {
@@ -266,113 +94,35 @@ static int hwdb_lookup(struct udev_device *dev, const char *subsys) {
if (!modalias)
return EXIT_FAILURE;
- trie_search_f(&trie, modalias, value_cb);
- return rc;
-}
-
-static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool test) {
- static const struct option options[] = {
- { "subsystem", required_argument, NULL, 's' },
- {}
- };
- const char *subsys = NULL;
-
- if (!trie.f)
- return EXIT_SUCCESS;
-
- for (;;) {
- int option;
-
- option = getopt_long(argc, argv, "s", options, NULL);
- if (option == -1)
- break;
-
- switch (option) {
- case 's':
- subsys = optarg;
- break;
- }
- }
-
- trie.dev = dev;
- trie.test = test;
- if (hwdb_lookup(dev, subsys) < 0)
- return EXIT_FAILURE;
+ udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, modalias, 0))
+ if (udev_builtin_add_property(dev, test,
+ udev_list_entry_get_name(entry),
+ udev_list_entry_get_value(entry)) < 0)
+ return EXIT_FAILURE;
return EXIT_SUCCESS;
}
/* called at udev startup and reload */
static int builtin_hwdb_init(struct udev *udev)
{
- struct stat st;
- const char sig[] = HWDB_SIG;
-
- if (trie.f)
+ if (hwdb)
return 0;
-
- trie.f = fopen(SYSCONFDIR "/udev/hwdb.bin", "re");
- if (!trie.f) {
- if (errno != EEXIST)
- log_error("Error reading " SYSCONFDIR "/udev/hwdb.bin: %m");
- return -errno;
- }
-
- if (fstat(fileno(trie.f), &st) < 0 || (size_t)st.st_size < offsetof(struct trie_header_f, strings_len) + 8) {
- log_error("Error reading " SYSCONFDIR "/udev/hwdb.bin: %m");
- fclose(trie.f);
- zero(trie);
- return -EINVAL;
- }
-
- trie.map = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fileno(trie.f), 0);
- if (trie.map == MAP_FAILED) {
- log_error("Error mapping " SYSCONFDIR "/udev/hwdb.bin: %m");
- fclose(trie.f);
- return -EINVAL;
- }
- trie.file_time_usec = ts_usec(&st.st_mtim);
- trie.map_size = st.st_size;
-
- if (memcmp(trie.map, sig, sizeof(trie.head->signature)) != 0 || (size_t)st.st_size != le64toh(trie.head->file_size)) {
- log_error("Unable to recognize the format of " SYSCONFDIR "/udev/hwdb.bin.");
- log_error("Please try 'udevadm hwdb --update' to re-create it.");
- munmap((void *)trie.map, st.st_size);
- fclose(trie.f);
- zero(trie);
- return EINVAL;
- }
-
- log_debug("=== trie on-disk ===\n");
- log_debug("tool version: %llu", (unsigned long long)le64toh(trie.head->tool_version));
- log_debug("file size: %8zi bytes\n", st.st_size);
- log_debug("header size %8zu bytes\n", (size_t)le64toh(trie.head->header_size));
- log_debug("strings %8zu bytes\n", (size_t)le64toh(trie.head->strings_len));
- log_debug("nodes %8zu bytes\n", (size_t)le64toh(trie.head->nodes_len));
+ hwdb = udev_hwdb_new(udev);
+ if (!hwdb)
+ return -ENOMEM;
return 0;
}
/* called on udev shutdown and reload request */
static void builtin_hwdb_exit(struct udev *udev)
{
- if (!trie.f)
- return;
- munmap((void *)trie.map, trie.map_size);
- fclose(trie.f);
- zero(trie);
+ hwdb = udev_hwdb_unref(hwdb);
}
/* called every couple of seconds during event activity; 'true' if config has changed */
static bool builtin_hwdb_validate(struct udev *udev)
{
- struct stat st;
-
- if (!trie.f)
- return false;
- if (fstat(fileno(trie.f), &st) < 0)
- return true;
- if (trie.file_time_usec != ts_usec(&st.st_mtim))
- return true;
- return false;
+ return udev_hwdb_validate(hwdb);
}
const struct udev_builtin udev_builtin_hwdb = {
diff --git a/src/udev/udev-hwdb.h b/src/udev/udev-hwdb.h
deleted file mode 100644
index 8a9955eb60..0000000000
--- a/src/udev/udev-hwdb.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2012 Kay Sievers <kay.sievers@vrfy.org>
-
- 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 "sparse-endian.h"
-
-#define HWDB_SIG { 'K', 'S', 'L', 'P', 'H', 'H', 'R', 'H' }
-
-/* on-disk trie objects */
-_packed_ struct trie_header_f {
- uint8_t signature[8];
-
- /* version of tool which created the file */
- le64_t tool_version;
- le64_t file_size;
-
- /* size of structures to allow them to grow */
- le64_t header_size;
- le64_t node_size;
- le64_t child_entry_size;
- le64_t value_entry_size;
-
- /* offset of the root trie node */
- le64_t nodes_root_off;
-
- /* size of the nodes and string section */
- le64_t nodes_len;
- le64_t strings_len;
-};
-
-_packed_ struct trie_node_f {
- /* prefix of lookup string, shared by all children */
- le64_t prefix_off;
- /* size of children entry array appended to the node */
- uint8_t children_count;
- uint8_t padding[7];
- /* size of value entry array appended to the node */
- le64_t values_count;
-};
-
-/* array of child entries, follows directly the node record */
-_packed_ struct trie_child_entry_f {
- /* index of the child node */
- uint8_t c;
- uint8_t padding[7];
- /* offset of the child node */
- le64_t child_off;
-};
-
-/* array of value entries, follows directly the node record/child array */
-_packed_ struct trie_value_entry_f {
- le64_t key_off;
- le64_t value_off;
-};
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index ce8eff4811..5587094e63 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -27,7 +27,7 @@
#include "conf-files.h"
#include "udev.h"
-#include "udev-hwdb.h"
+#include "libudev-hwdb-def.h"
/*
* Generic udev properties, key/value database based on modalias strings.
@@ -35,7 +35,7 @@
*/
static const char * const conf_file_dirs[] = {
- SYSCONFDIR "/udev/hwdb.d",
+ "/etc/udev/hwdb.d",
UDEVLIBEXECDIR "/hwdb.d",
NULL
};
@@ -291,7 +291,7 @@ static int64_t trie_store_nodes(struct trie_f *trie, struct trie_node *node) {
.children_count = node->children_count,
.values_count = htole64(node->values_count),
};
- struct trie_child_entry_f *children;
+ struct trie_child_entry_f *children = NULL;
int64_t node_off;
if (node->children_count) {
@@ -390,12 +390,15 @@ static int trie_store(struct trie *trie, const char *filename) {
}
log_debug("=== trie on-disk ===\n");
- log_debug("size: %8zi bytes\n", size);
+ log_debug("size: %8llu bytes\n", (unsigned long long)size);
log_debug("header: %8zu bytes\n", sizeof(struct trie_header_f));
- log_debug("nodes: %8zu bytes (%8zi)\n", t.nodes_count * sizeof(struct trie_node_f), t.nodes_count);
- log_debug("child pointers: %8zu bytes (%8zi)\n", t.children_count * sizeof(struct trie_child_entry_f), t.children_count);
- log_debug("value pointers: %8zu bytes (%8zi)\n", t.values_count * sizeof(struct trie_value_entry_f), t.values_count);
- log_debug("string store: %8zu bytes\n", trie->strings->len);
+ log_debug("nodes: %8llu bytes (%8llu)\n",
+ (unsigned long long)t.nodes_count * sizeof(struct trie_node_f), (unsigned long long)t.nodes_count);
+ log_debug("child pointers: %8llu bytes (%8llu)\n",
+ (unsigned long long)t.children_count * sizeof(struct trie_child_entry_f), (unsigned long long)t.children_count);
+ log_debug("value pointers: %8llu bytes (%8llu)\n",
+ (unsigned long long)t.values_count * sizeof(struct trie_value_entry_f), (unsigned long long)t.values_count);
+ log_debug("string store: %8llu bytes\n", (unsigned long long)trie->strings->len);
log_debug("strings start: %8llu\n", (unsigned long long) t.strings_off);
out:
free(filename_tmp);
@@ -406,12 +409,14 @@ static int import_file(struct trie *trie, const char *filename) {
FILE *f;
char line[LINE_MAX];
char match[LINE_MAX];
+ char cond[LINE_MAX];
f = fopen(filename, "re");
if (f == NULL)
return -errno;
match[0] = '\0';
+ cond[0] = '\0';
while (fgets(line, sizeof(line), f)) {
size_t len;
@@ -421,6 +426,7 @@ static int import_file(struct trie *trie, const char *filename) {
/* new line, new record */
if (line[0] == '\n') {
match[0] = '\0';
+ cond[0] = '\0';
continue;
}
@@ -433,9 +439,19 @@ static int import_file(struct trie *trie, const char *filename) {
/* start of new record */
if (match[0] == '\0') {
strcpy(match, line);
+ cond[0] = '\0';
continue;
}
+ if (line[0] == '+') {
+ strcpy(cond, line);
+ continue;
+ }
+
+ /* TODO: support +; skip the entire record until we support it */
+ if (cond[0] != '\0')
+ continue;
+
/* value lines */
if (line[0] == ' ') {
char *value;
@@ -535,13 +551,12 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
log_debug("strings incoming: %8zu bytes (%8zu)\n", trie->strings->in_len, trie->strings->in_count);
log_debug("strings dedup'ed: %8zu bytes (%8zu)\n", trie->strings->dedup_len, trie->strings->dedup_count);
- mkdir_parents(SYSCONFDIR "/udev/hwdb.bin", 0755);
- err = trie_store(trie, SYSCONFDIR "/udev/hwdb.bin");
+ mkdir_parents("/etc/udev/hwdb.bin", 0755);
+ err = trie_store(trie, "/etc/udev/hwdb.bin");
if (err < 0) {
- log_error("Failure writing hardware database '%s': %s", SYSCONFDIR "/udev/hwdb.bin", strerror(-err));
+ log_error("Failure writing hardware database '%s': %s", "/etc/udev/hwdb.bin", strerror(-err));
rc = EXIT_FAILURE;
}
-
out:
if (trie->root)
trie_node_cleanup(trie->root);