[systemd-devel] [RFC][PATCH 2/2] libudev: device - replace by a thin wrapper around sd-device
Tom Gundersen
teg at jklm.no
Wed Apr 1 06:00:41 PDT 2015
---
Makefile.am | 33 +-
src/libudev/libudev-device-internal.h | 62 ++
src/libudev/libudev-device-private.c | 511 +++++++---
src/libudev/libudev-device.c | 1808 ++++++---------------------------
4 files changed, 779 insertions(+), 1635 deletions(-)
create mode 100644 src/libudev/libudev-device-internal.h
diff --git a/Makefile.am b/Makefile.am
index 9509247..1b64b62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2144,6 +2144,7 @@ systemd_shutdown_SOURCES = \
systemd_shutdown_LDADD = \
libsystemd-label.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2345,6 +2346,7 @@ systemd_fsck_SOURCES = \
systemd_fsck_LDADD = \
libsystemd-internal.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2380,6 +2382,7 @@ systemd_ac_power_SOURCES = \
systemd_ac_power_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2651,8 +2654,8 @@ systemd_gpt_auto_generator_SOURCES = \
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
- libsystemd-internal.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
$(BLKID_LIBS)
@@ -2804,8 +2807,8 @@ systemd_nspawn_CFLAGS = \
systemd_nspawn_LDADD = \
libsystemd-label.la \
- libsystemd-internal.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
$(BLKID_LIBS)
@@ -3618,10 +3621,12 @@ lib_LTLIBRARIES += \
libudev_la_SOURCES =\
src/libudev/libudev.sym \
src/libudev/libudev-private.h \
+ src/libudev/libudev-device-internal.h \
src/libudev/libudev.c \
src/libudev/libudev-list.c \
src/libudev/libudev-util.c \
src/libudev/libudev-device.c \
+ src/libudev/libudev-device-private.c \
src/libudev/libudev-enumerate.c \
src/libudev/libudev-monitor.c \
src/libudev/libudev-queue.c \
@@ -3673,8 +3678,7 @@ noinst_LTLIBRARIES += \
libudev-internal.la
libudev_internal_la_SOURCES =\
- $(libudev_la_SOURCES) \
- src/libudev/libudev-device-private.c
+ $(libudev_la_SOURCES)
libudev_internal_la_CFLAGS = \
$(AM_CFLAGS) \
@@ -3859,9 +3863,9 @@ systemd_hwdb_SOURCES = \
src/hwdb/hwdb.c
systemd_hwdb_LDADD = \
+ libudev-internal.la \
libsystemd-shared.la \
- libsystemd-internal.la \
- libudev-internal.la
+ libsystemd-internal.la
rootbin_PROGRAMS += \
systemd-hwdb
@@ -3971,6 +3975,7 @@ ata_id_SOURCES = \
ata_id_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@ -3982,6 +3987,7 @@ cdrom_id_SOURCES = \
cdrom_id_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@ -3996,6 +4002,7 @@ collect_SOURCES = \
collect_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@ -4010,6 +4017,7 @@ scsi_id_SOURCES =\
scsi_id_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@ -4024,6 +4032,7 @@ v4l_id_SOURCES = \
v4l_id_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@ -4038,6 +4047,7 @@ accelerometer_SOURCES = \
accelerometer_LDADD = \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@ -4937,6 +4947,7 @@ systemd_backlight_SOURCES = \
systemd_backlight_LDADD = \
libsystemd-label.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
endif
@@ -4957,6 +4968,7 @@ systemd_rfkill_SOURCES = \
systemd_rfkill_LDADD = \
libsystemd-label.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
endif
@@ -4985,6 +4997,7 @@ systemd_cryptsetup_CFLAGS = \
systemd_cryptsetup_LDADD = \
libsystemd-label.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
$(LIBCRYPTSETUP_LIBS)
@@ -5280,8 +5293,8 @@ libsystemd_machine_core_la_SOURCES = \
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-internal.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
noinst_LTLIBRARIES += \
@@ -5797,8 +5810,8 @@ networkctl_SOURCES = \
src/network/networkctl.c
networkctl_LDADD = \
- libsystemd-internal.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
libsystemd-network.la
@@ -5905,8 +5918,8 @@ libsystemd_logind_core_la_SOURCES = \
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-internal.la \
libudev-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
if HAVE_ACL
@@ -5929,10 +5942,10 @@ loginctl_SOURCES = \
src/login/sysfs-show.c
loginctl_LDADD = \
+ libudev-internal.la \
libsystemd-internal.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
- libudev-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/libudev-device-internal.h
new file mode 100644
index 0000000..18ae7a9
--- /dev/null
+++ b/src/libudev/libudev-device-internal.h
@@ -0,0 +1,62 @@
+/***
+ This file is part of systemd.
+
+ Copyright 2008-2012 Kay Sievers <kay at vrfy.org>
+ Copyright 2015 Tom Gundersen <teg at jklm.no>
+
+ 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/>.
+***/
+
+#pragma once
+
+#include "libudev.h"
+#include "sd-device.h"
+
+/**
+ * udev_device:
+ *
+ * Opaque object representing one kernel sys device.
+ */
+struct udev_device {
+ struct udev *udev;
+
+ /* real device object */
+ sd_device *device;
+
+ /* legacy */
+ int refcount;
+
+ struct udev_device *parent;
+ bool parent_set;
+
+ struct udev_list properties;
+ uint64_t properties_generation;
+ struct udev_list tags;
+ uint64_t tags_generation;
+ struct udev_list devlinks;
+ uint64_t devlinks_generation;
+ struct udev_list sysattrs;
+ bool sysattrs_read;
+};
+
+struct udev_device *udev_device_new(struct udev *udev);
+
+#define assert_return_errno(expr, r, err) \
+ do { \
+ if (_unlikely_(!(expr))) { \
+ log_assert_failed_return(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ errno = err; \
+ return (r); \
+ } \
+ } while (false)
diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index e590288..bb4d7e6 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -2,6 +2,7 @@
This file is part of systemd.
Copyright 2008-2012 Kay Sievers <kay at vrfy.org>
+ Copyright 2015 Tom Gundersen <teg at jklm.no>
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
@@ -17,172 +18,392 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
#include "libudev.h"
#include "libudev-private.h"
+#include "libudev-device-internal.h"
+
+#include "device-private.h"
+
+int udev_device_tag_index(struct udev_device *udev_device, struct udev_device *udev_device_old, bool add) {
+ sd_device *device_old = NULL;
+ int r;
+
+ assert(udev_device);
+
+ if (udev_device_old)
+ device_old = udev_device_old->device;
+
+ r = device_tag_index(udev_device->device, device_old, add);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int udev_device_update_db(struct udev_device *udev_device) {
+ int r;
+
+ assert(udev_device);
+
+ r = device_update_db(udev_device->device);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int udev_device_delete_db(struct udev_device *udev_device) {
+ int r;
+
+ assert(udev_device);
+
+ r = device_delete_db(udev_device->device);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int udev_device_get_ifindex(struct udev_device *udev_device) {
+ int r, ifindex;
+
+ assert(udev_device);
+
+ r = sd_device_get_ifindex(udev_device->device, &ifindex);
+ if (r < 0)
+ return r;
+
+ return ifindex;
+}
+
+const char *udev_device_get_devpath_old(struct udev_device *udev_device) {
+ const char *devpath_old = NULL;
+ int r;
-static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
-{
- const char *id;
- char filename[UTIL_PATH_SIZE];
-
- id = udev_device_get_id_filename(dev);
- if (id == NULL)
- return;
- strscpyl(filename, sizeof(filename), "/run/udev/tags/", tag, "/", id, NULL);
-
- if (add) {
- int fd;
-
- mkdir_parents(filename, 0755);
- fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
- if (fd >= 0)
- close(fd);
- } else {
- unlink(filename);
+ assert(udev_device);
+
+ r = sd_device_get_property_value(udev_device->device, "DEVPATH_OLD", &devpath_old);
+ if (r < 0 && r != -ENOENT) {
+ errno = -r;
+ return NULL;
}
+
+ return devpath_old;
}
-int udev_device_tag_index(struct udev_device *dev, struct udev_device *dev_old, bool add)
-{
- struct udev_list_entry *list_entry;
- bool found;
-
- if (add && dev_old != NULL) {
- /* delete possible left-over tags */
- udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(dev_old)) {
- const char *tag_old = udev_list_entry_get_name(list_entry);
- struct udev_list_entry *list_entry_current;
-
- found = false;
- udev_list_entry_foreach(list_entry_current, udev_device_get_tags_list_entry(dev)) {
- const char *tag = udev_list_entry_get_name(list_entry_current);
-
- if (streq(tag, tag_old)) {
- found = true;
- break;
- }
- }
- if (!found)
- udev_device_tag(dev_old, tag_old, false);
- }
+mode_t udev_device_get_devnode_mode(struct udev_device *udev_device) {
+ mode_t mode;
+ int r;
+
+ assert(udev_device);
+
+ r = device_get_devnode_mode(udev_device->device, &mode);
+ if (r < 0) {
+ errno = -r;
+ return 0;
}
- udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(dev))
- udev_device_tag(dev, udev_list_entry_get_name(list_entry), add);
+ return mode;
+}
- return 0;
+uid_t udev_device_get_devnode_uid(struct udev_device *udev_device) {
+ uid_t uid;
+ int r;
+
+ assert(udev_device);
+
+ r = device_get_devnode_uid(udev_device->device, &uid);
+ if (r < 0) {
+ errno = -r;
+ return 0;
+ }
+
+ return uid;
}
-static bool device_has_info(struct udev_device *udev_device)
-{
- struct udev_list_entry *list_entry;
-
- if (udev_device_get_devlinks_list_entry(udev_device) != NULL)
- return true;
- if (udev_device_get_devlink_priority(udev_device) != 0)
- return true;
- udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device))
- if (udev_list_entry_get_num(list_entry))
- return true;
- if (udev_device_get_tags_list_entry(udev_device) != NULL)
- return true;
- if (udev_device_get_watch_handle(udev_device) >= 0)
- return true;
- return false;
-}
-
-int udev_device_update_db(struct udev_device *udev_device)
-{
- bool has_info;
- const char *id;
- char filename[UTIL_PATH_SIZE];
- char filename_tmp[UTIL_PATH_SIZE];
- FILE *f;
- int r;
-
- id = udev_device_get_id_filename(udev_device);
- if (id == NULL)
- return -1;
-
- has_info = device_has_info(udev_device);
- strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
-
- /* do not store anything for otherwise empty devices */
- if (!has_info &&
- major(udev_device_get_devnum(udev_device)) == 0 &&
- udev_device_get_ifindex(udev_device) == 0) {
- unlink(filename);
+gid_t udev_device_get_devnode_gid(struct udev_device *udev_device) {
+ gid_t gid;
+ int r;
+
+ assert(udev_device);
+
+ r = device_get_devnode_gid(udev_device->device, &gid);
+ if (r < 0) {
+ errno = -r;
return 0;
}
- /* write a database file */
- strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
- mkdir_parents(filename_tmp, 0755);
- f = fopen(filename_tmp, "we");
- if (f == NULL)
- return log_debug_errno(errno, "unable to create temporary db file '%s': %m", filename_tmp);
-
- /*
- * set 'sticky' bit to indicate that we should not clean the
- * database when we transition from initramfs to the real root
- */
- if (udev_device_get_db_persist(udev_device))
- fchmod(fileno(f), 01644);
-
- if (has_info) {
- struct udev_list_entry *list_entry;
-
- if (major(udev_device_get_devnum(udev_device)) > 0) {
- udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(udev_device))
- fprintf(f, "S:%s\n", udev_list_entry_get_name(list_entry) + strlen("/dev/"));
- if (udev_device_get_devlink_priority(udev_device) != 0)
- fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
- if (udev_device_get_watch_handle(udev_device) >= 0)
- fprintf(f, "W:%i\n", udev_device_get_watch_handle(udev_device));
- }
-
- if (udev_device_get_usec_initialized(udev_device) > 0)
- fprintf(f, "I:"USEC_FMT"\n", udev_device_get_usec_initialized(udev_device));
-
- udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
- if (!udev_list_entry_get_num(list_entry))
- continue;
- fprintf(f, "E:%s=%s\n",
- udev_list_entry_get_name(list_entry),
- udev_list_entry_get_value(list_entry));
- }
-
- udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(udev_device))
- fprintf(f, "G:%s\n", udev_list_entry_get_name(list_entry));
+ return gid;
+}
+
+void udev_device_ensure_usec_initialized(struct udev_device *udev_device, struct udev_device *udev_device_old) {
+ sd_device *device_old = NULL;
+
+ assert(udev_device);
+
+ if (udev_device_old)
+ device_old = udev_device_old->device;
+
+ device_ensure_usec_initialized(udev_device->device, device_old);
+}
+
+char **udev_device_get_properties_envp(struct udev_device *udev_device) {
+ char **envp;
+ int r;
+
+ assert(udev_device);
+
+ r = device_get_properties_strv(udev_device->device, &envp);
+ if (r < 0) {
+ errno = -r;
+ return NULL;
}
- fclose(f);
- r = rename(filename_tmp, filename);
+ return envp;
+}
+
+ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf) {
+ const char *nulstr;
+ size_t len;
+ int r;
+
+ assert(udev_device);
+ assert(buf);
+
+ r = device_get_properties_nulstr(udev_device->device, (const uint8_t **)&nulstr, &len);
if (r < 0)
- return -1;
- log_debug("created %s file '%s' for '%s'", has_info ? "db" : "empty",
- filename, udev_device_get_devpath(udev_device));
+ return r;
+
+ *buf = nulstr;
+
+ return len;
+}
+
+int udev_device_get_devlink_priority(struct udev_device *udev_device) {
+ int priority, r;
+
+ assert(udev_device);
+
+ r = device_get_devlink_priority(udev_device->device, &priority);
+ if (r < 0)
+ return r;
+
+ return priority;
+}
+
+int udev_device_get_watch_handle(struct udev_device *udev_device) {
+ int handle, r;
+
+ assert(udev_device);
+
+ r = device_get_watch_handle(udev_device->device, &handle);
+ if (r < 0)
+ return r;
+
+ return handle;
+}
+
+void udev_device_set_is_initialized(struct udev_device *udev_device) {
+ assert(udev_device);
+
+ device_set_is_initialized(udev_device->device);
+}
+
+int udev_device_rename(struct udev_device *udev_device, const char *name) {
+ int r;
+
+ assert(udev_device);
+
+ r = device_rename(udev_device->device, name);
+ if (r < 0)
+ return r;
+
return 0;
}
-int udev_device_delete_db(struct udev_device *udev_device)
-{
- const char *id;
- char filename[UTIL_PATH_SIZE];
+struct udev_device *udev_device_shallow_clone(struct udev_device *old_device) {
+ struct udev_device *device;
+ int r;
+
+ assert(old_device);
+
+ device = udev_device_new(old_device->udev);
+ if (!device)
+ return NULL;
+
+ r = device_shallow_clone(old_device->device, &device->device);
+ if (r < 0) {
+ udev_device_unref(device);
+ errno = -r;
+ return NULL;
+ }
+
+ return device;
+}
+
+struct udev_device *udev_device_clone_with_db(struct udev_device *udev_device_old) {
+ struct udev_device *udev_device;
+ int r;
+
+ assert(udev_device_old);
+
+ udev_device = udev_device_new(udev_device_old->udev);
+ if (!udev_device)
+ return NULL;
+
+ r = device_clone_with_db(udev_device_old->device, &udev_device->device);
+ if (r < 0) {
+ udev_device_unref(udev_device);
+ errno = -r;
+ return NULL;
+ }
+
+ return udev_device;
+}
+
+struct udev_device *udev_device_new_from_nulstr(struct udev *udev, char *nulstr, ssize_t buflen) {
+ struct udev_device *device;
+ int r;
+
+ device = udev_device_new(udev);
+ if (!device)
+ return NULL;
+
+ r = device_new_from_nulstr(&device->device, (uint8_t*)nulstr, buflen);
+ if (r < 0) {
+ udev_device_unref(device);
+ errno = -r;
+ return NULL;
+ }
+
+ return device;
+}
+
+struct udev_device *udev_device_new_from_synthetic_event(struct udev *udev, const char *syspath, const char *action) {
+ struct udev_device *device;
+ int r;
+
+ device = udev_device_new(udev);
+ if (!device)
+ return NULL;
+
+ r = device_new_from_synthetic_event(&device->device, syspath, action);
+ if (r < 0) {
+ udev_device_unref(device);
+ errno = -r;
+ return NULL;
+ }
+
+ return device;
+}
+
+int udev_device_copy_properties(struct udev_device *udev_device_dst, struct udev_device *udev_device_src) {
+ int r;
+
+ assert(udev_device_dst);
+ assert(udev_device_src);
+
+ r = device_copy_properties(udev_device_dst->device, udev_device_src->device);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+const char *udev_device_get_id_filename(struct udev_device *udev_device) {
+ const char *filename;
+ int r;
+
+ assert(udev_device);
+
+ r = device_get_id_filename(udev_device->device, &filename);
+ if (r < 0) {
+ errno = -r;
+ return NULL;
+ }
+
+ return filename;
+}
+
+int udev_device_set_watch_handle(struct udev_device *udev_device, int handle) {
- id = udev_device_get_id_filename(udev_device);
- if (id == NULL)
- return -1;
- strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
+ assert(udev_device);
+
+ device_set_watch_handle(udev_device->device, handle);
+
+ return 0;
+}
+
+void udev_device_set_db_persist(struct udev_device *udev_device) {
+ assert(udev_device);
+
+ device_set_db_persist(udev_device->device);
+}
+
+int udev_device_set_devlink_priority(struct udev_device *udev_device, int priority) {
+ assert(udev_device);
+
+ device_set_devlink_priority(udev_device->device, priority);
- unlink(filename);
return 0;
}
+
+int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink) {
+ int r;
+
+ assert(udev_device);
+
+ r = device_add_devlink(udev_device->device, devlink);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int udev_device_add_property(struct udev_device *udev_device, const char *property, const char *value) {
+ int r;
+
+ assert(udev_device);
+
+ r = device_add_property(udev_device->device, property, value);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int udev_device_add_tag(struct udev_device *udev_device, const char *tag) {
+ int r;
+
+ assert(udev_device);
+
+ r = device_add_tag(udev_device->device, tag);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+void udev_device_remove_tag(struct udev_device *udev_device, const char *tag) {
+ assert(udev_device);
+
+ device_remove_tag(udev_device->device, tag);
+}
+
+void udev_device_cleanup_tags_list(struct udev_device *udev_device) {
+ assert(udev_device);
+
+ device_cleanup_tags(udev_device->device);
+}
+
+void udev_device_cleanup_devlinks_list(struct udev_device *udev_device) {
+ assert(udev_device);
+
+ device_cleanup_devlinks(udev_device->device);
+}
+
+void udev_device_set_info_loaded(struct udev_device *udev_device) {
+ assert(udev_device);
+
+ device_seal(udev_device->device);
+}
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index d510b47..a55cd25 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -2,6 +2,7 @@
This file is part of systemd.
Copyright 2008-2012 Kay Sievers <kay at vrfy.org>
+ Copyright 2015 Tom Gundersen <teg at jklm.no>
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
@@ -33,13 +34,13 @@
#include <sys/socket.h>
#include <linux/sockios.h>
+#include "sd-device.h"
+#include "device-util.h"
+#include "device-private.h"
+
#include "libudev.h"
#include "libudev-private.h"
-
-static int udev_device_read_uevent_file(struct udev_device *udev_device);
-static int udev_device_read_db(struct udev_device *udev_device);
-static int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode);
-static struct udev_list_entry *udev_device_add_property_internal(struct udev_device *udev_device, const char *key, const char *value);
+#include "libudev-device-internal.h"
/**
* SECTION:libudev-device
@@ -52,59 +53,6 @@ static struct udev_list_entry *udev_device_add_property_internal(struct udev_dev
*/
/**
- * udev_device:
- *
- * Opaque object representing one kernel sys device.
- */
-struct udev_device {
- struct udev *udev;
- struct udev_device *parent_device;
- char *syspath;
- const char *devpath;
- char *sysname;
- const char *sysnum;
- char *devnode;
- mode_t devnode_mode;
- uid_t devnode_uid;
- gid_t devnode_gid;
- char *subsystem;
- char *devtype;
- char *driver;
- char *action;
- char *devpath_old;
- char *id_filename;
- char **envp;
- char *monitor_buf;
- size_t monitor_buf_len;
- struct udev_list devlinks_list;
- struct udev_list properties_list;
- struct udev_list sysattr_value_list;
- struct udev_list sysattr_list;
- struct udev_list tags_list;
- unsigned long long int seqnum;
- usec_t usec_initialized;
- int devlink_priority;
- int refcount;
- dev_t devnum;
- int ifindex;
- int watch_handle;
- int maj, min;
- bool parent_set;
- bool subsystem_set;
- bool devtype_set;
- bool devlinks_uptodate;
- bool envp_uptodate;
- bool tags_uptodate;
- bool driver_set;
- bool info_loaded;
- bool db_loaded;
- bool uevent_loaded;
- bool is_initialized;
- bool sysattr_list_read;
- bool db_persist;
-};
-
-/**
* udev_device_get_seqnum:
* @udev_device: udev device
*
@@ -115,36 +63,27 @@ struct udev_device {
**/
_public_ unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return 0;
- return udev_device->seqnum;
-}
-
-static int udev_device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum)
-{
- char num[32];
+ const char *seqnum;
+ unsigned long long ret;
+ int r;
- udev_device->seqnum = seqnum;
- snprintf(num, sizeof(num), "%llu", seqnum);
- udev_device_add_property_internal(udev_device, "SEQNUM", num);
- return 0;
-}
+ assert_return_errno(udev_device, 0, EINVAL);
-int udev_device_get_ifindex(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- udev_device_read_uevent_file(udev_device);
- return udev_device->ifindex;
-}
+ r = sd_device_get_property_value(udev_device->device, "SEQNUM", &seqnum);
+ if (r == -ENOENT)
+ return 0;
+ else if (r < 0) {
+ errno = -r;
+ return 0;
+ }
-static int udev_device_set_ifindex(struct udev_device *udev_device, int ifindex)
-{
- char num[32];
+ r = safe_atollu(seqnum, &ret);
+ if (r < 0) {
+ errno = -r;
+ return 0;
+ }
- udev_device->ifindex = ifindex;
- snprintf(num, sizeof(num), "%d", ifindex);
- udev_device_add_property_internal(udev_device, "IFINDEX", num);
- return 0;
+ return ret;
}
/**
@@ -157,45 +96,18 @@ static int udev_device_set_ifindex(struct udev_device *udev_device, int ifindex)
**/
_public_ dev_t udev_device_get_devnum(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return makedev(0, 0);
- if (!udev_device->info_loaded)
- udev_device_read_uevent_file(udev_device);
- return udev_device->devnum;
-}
-
-static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
-{
- char num[32];
-
- udev_device->devnum = devnum;
-
- snprintf(num, sizeof(num), "%u", major(devnum));
- udev_device_add_property_internal(udev_device, "MAJOR", num);
- snprintf(num, sizeof(num), "%u", minor(devnum));
- udev_device_add_property_internal(udev_device, "MINOR", num);
- return 0;
-}
-
-const char *udev_device_get_devpath_old(struct udev_device *udev_device)
-{
- return udev_device->devpath_old;
-}
+ dev_t devnum;
+ int r;
-static int udev_device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old)
-{
- const char *pos;
+ assert_return_errno(udev_device, makedev(0, 0), EINVAL);
- free(udev_device->devpath_old);
- udev_device->devpath_old = strdup(devpath_old);
- if (udev_device->devpath_old == NULL)
- return -ENOMEM;
- udev_device_add_property_internal(udev_device, "DEVPATH_OLD", udev_device->devpath_old);
+ r = sd_device_get_devnum(udev_device->device, &devnum);
+ if (r < 0) {
+ errno = -r;
+ return makedev(0, 0);
+ }
- pos = strrchr(udev_device->devpath_old, '/');
- if (pos == NULL)
- return -EINVAL;
- return 0;
+ return devnum;
}
/**
@@ -208,27 +120,18 @@ static int udev_device_set_devpath_old(struct udev_device *udev_device, const ch
**/
_public_ const char *udev_device_get_driver(struct udev_device *udev_device)
{
- char driver[UTIL_NAME_SIZE];
+ const char *driver;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
- if (udev_device == NULL)
+ r = sd_device_get_driver(udev_device->device, &driver);
+ if (r < 0) {
+ errno = -r;
return NULL;
- if (!udev_device->driver_set) {
- udev_device->driver_set = true;
- if (util_get_sys_core_link_value(udev_device->udev, "driver", udev_device->syspath, driver, sizeof(driver)) > 0)
- udev_device->driver = strdup(driver);
}
- return udev_device->driver;
-}
-static int udev_device_set_driver(struct udev_device *udev_device, const char *driver)
-{
- free(udev_device->driver);
- udev_device->driver = strdup(driver);
- if (udev_device->driver == NULL)
- return -ENOMEM;
- udev_device->driver_set = true;
- udev_device_add_property_internal(udev_device, "DRIVER", udev_device->driver);
- return 0;
+ return driver;
}
/**
@@ -241,35 +144,18 @@ static int udev_device_set_driver(struct udev_device *udev_device, const char *d
**/
_public_ const char *udev_device_get_devtype(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ const char *devtype;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_devtype(udev_device->device, &devtype);
+ if (r < 0) {
+ errno = -r;
return NULL;
- if (!udev_device->devtype_set) {
- udev_device->devtype_set = true;
- udev_device_read_uevent_file(udev_device);
}
- return udev_device->devtype;
-}
-
-static int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype)
-{
- free(udev_device->devtype);
- udev_device->devtype = strdup(devtype);
- if (udev_device->devtype == NULL)
- return -ENOMEM;
- udev_device->devtype_set = true;
- udev_device_add_property_internal(udev_device, "DEVTYPE", udev_device->devtype);
- return 0;
-}
-static int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem)
-{
- free(udev_device->subsystem);
- udev_device->subsystem = strdup(subsystem);
- if (udev_device->subsystem == NULL)
- return -ENOMEM;
- udev_device->subsystem_set = true;
- udev_device_add_property_internal(udev_device, "SUBSYSTEM", udev_device->subsystem);
- return 0;
+ return devtype;
}
/**
@@ -283,292 +169,18 @@ static int udev_device_set_subsystem(struct udev_device *udev_device, const char
**/
_public_ const char *udev_device_get_subsystem(struct udev_device *udev_device)
{
- char subsystem[UTIL_NAME_SIZE];
-
- if (udev_device == NULL)
- return NULL;
- if (!udev_device->subsystem_set) {
- udev_device->subsystem_set = true;
- /* read "subsystem" link */
- if (util_get_sys_core_link_value(udev_device->udev, "subsystem", udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
- udev_device_set_subsystem(udev_device, subsystem);
- return udev_device->subsystem;
- }
- /* implicit names */
- if (startswith(udev_device->devpath, "/module/")) {
- udev_device_set_subsystem(udev_device, "module");
- return udev_device->subsystem;
- }
- if (strstr(udev_device->devpath, "/drivers/") != NULL) {
- udev_device_set_subsystem(udev_device, "drivers");
- return udev_device->subsystem;
- }
- if (startswith(udev_device->devpath, "/subsystem/") ||
- startswith(udev_device->devpath, "/class/") ||
- startswith(udev_device->devpath, "/bus/")) {
- udev_device_set_subsystem(udev_device, "subsystem");
- return udev_device->subsystem;
- }
- }
- return udev_device->subsystem;
-}
-
-mode_t udev_device_get_devnode_mode(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- udev_device_read_uevent_file(udev_device);
- return udev_device->devnode_mode;
-}
-
-static int udev_device_set_devnode_mode(struct udev_device *udev_device, mode_t mode)
-{
- char num[32];
-
- udev_device->devnode_mode = mode;
- snprintf(num, sizeof(num), "%#o", mode);
- udev_device_add_property_internal(udev_device, "DEVMODE", num);
- return 0;
-}
-
-uid_t udev_device_get_devnode_uid(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- udev_device_read_uevent_file(udev_device);
- return udev_device->devnode_uid;
-}
-
-static int udev_device_set_devnode_uid(struct udev_device *udev_device, uid_t uid)
-{
- char num[32];
-
- udev_device->devnode_uid = uid;
- snprintf(num, sizeof(num), "%u", uid);
- udev_device_add_property_internal(udev_device, "DEVUID", num);
- return 0;
-}
-
-gid_t udev_device_get_devnode_gid(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- udev_device_read_uevent_file(udev_device);
- return udev_device->devnode_gid;
-}
-
-static int udev_device_set_devnode_gid(struct udev_device *udev_device, gid_t gid)
-{
- char num[32];
-
- udev_device->devnode_gid = gid;
- snprintf(num, sizeof(num), "%u", gid);
- udev_device_add_property_internal(udev_device, "DEVGID", num);
- return 0;
-}
-
-static struct udev_list_entry *udev_device_add_property_internal(struct udev_device *udev_device, const char *key, const char *value)
-{
- udev_device->envp_uptodate = false;
- if (value == NULL) {
- struct udev_list_entry *list_entry;
-
- list_entry = udev_device_get_properties_list_entry(udev_device);
- list_entry = udev_list_entry_get_by_name(list_entry, key);
- if (list_entry != NULL)
- udev_list_entry_delete(list_entry);
- return NULL;
- }
- return udev_list_entry_add(&udev_device->properties_list, key, value);
-}
-
-
-int udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
-{
- struct udev_list_entry *property;
-
- property = udev_device_add_property_internal(udev_device, key, value);
-
- /* store in db, skip private keys */
- if (key[0] != '.')
- udev_list_entry_set_num(property, true);
-
- return 0;
-}
+ const char *subsystem;
+ int r;
-static struct udev_list_entry *udev_device_add_property_from_string(struct udev_device *udev_device, const char *property)
-{
- char name[UTIL_LINE_SIZE];
- char *val;
+ assert_return_errno(udev_device, NULL, EINVAL);
- strscpy(name, sizeof(name), property);
- val = strchr(name, '=');
- if (val == NULL)
+ r = sd_device_get_subsystem(udev_device->device, &subsystem);
+ if (r < 0) {
+ errno = -r;
return NULL;
- val[0] = '\0';
- val = &val[1];
- if (val[0] == '\0')
- val = NULL;
- return udev_device_add_property_internal(udev_device, name, val);
-}
-
-static int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath)
-{
- const char *pos;
- size_t len;
-
- free(udev_device->syspath);
- udev_device->syspath = strdup(syspath);
- if (udev_device->syspath == NULL)
- return -ENOMEM;
- udev_device->devpath = udev_device->syspath + strlen("/sys");
- udev_device_add_property_internal(udev_device, "DEVPATH", udev_device->devpath);
-
- pos = strrchr(udev_device->syspath, '/');
- if (pos == NULL)
- return -EINVAL;
- udev_device->sysname = strdup(&pos[1]);
- if (udev_device->sysname == NULL)
- return -ENOMEM;
-
- /* some devices have '!' in their name, change that to '/' */
- len = 0;
- while (udev_device->sysname[len] != '\0') {
- if (udev_device->sysname[len] == '!')
- udev_device->sysname[len] = '/';
- len++;
- }
-
- /* trailing number */
- while (len > 0 && isdigit(udev_device->sysname[--len]))
- udev_device->sysnum = &udev_device->sysname[len];
-
- /* sysname is completely numeric */
- if (len == 0)
- udev_device->sysnum = NULL;
-
- return 0;
-}
-
-static void udev_device_set_usec_initialized(struct udev_device *udev_device, usec_t usec_initialized)
-{
- char num[DECIMAL_STR_MAX(usec_t)];
-
- udev_device->usec_initialized = usec_initialized;
- snprintf(num, sizeof(num), USEC_FMT, usec_initialized);
- udev_device_add_property_internal(udev_device, "USEC_INITIALIZED", num);
-}
-
-void udev_device_ensure_usec_initialized(struct udev_device *udev_device, struct udev_device *old_device)
-{
- if (old_device && old_device->usec_initialized != 0)
- udev_device_set_usec_initialized(udev_device, old_device->usec_initialized);
- else
- udev_device_set_usec_initialized(udev_device, now(CLOCK_MONOTONIC));
-}
-
-static int udev_device_set_action(struct udev_device *udev_device, const char *action)
-{
- free(udev_device->action);
- udev_device->action = strdup(action);
- if (udev_device->action == NULL)
- return -ENOMEM;
- udev_device_add_property_internal(udev_device, "ACTION", udev_device->action);
- return 0;
-}
-
-/*
- * parse property string, and if needed, update internal values accordingly
- *
- * udev_device_add_property_from_string_parse_finish() needs to be
- * called after adding properties, and its return value checked
- *
- * udev_device_set_info_loaded() needs to be set, to avoid trying
- * to use a device without a DEVPATH set
- */
-static void udev_device_add_property_from_string_parse(struct udev_device *udev_device, const char *property)
-{
- if (startswith(property, "DEVPATH=")) {
- char path[UTIL_PATH_SIZE];
-
- strscpyl(path, sizeof(path), "/sys", &property[8], NULL);
- udev_device_set_syspath(udev_device, path);
- } else if (startswith(property, "SUBSYSTEM=")) {
- udev_device_set_subsystem(udev_device, &property[10]);
- } else if (startswith(property, "DEVTYPE=")) {
- udev_device_set_devtype(udev_device, &property[8]);
- } else if (startswith(property, "DEVNAME=")) {
- udev_device_set_devnode(udev_device, &property[8]);
- } else if (startswith(property, "DEVLINKS=")) {
- char devlinks[UTIL_PATH_SIZE];
- char *slink;
- char *next;
-
- strscpy(devlinks, sizeof(devlinks), &property[9]);
- slink = devlinks;
- next = strchr(slink, ' ');
- while (next != NULL) {
- next[0] = '\0';
- udev_device_add_devlink(udev_device, slink);
- slink = &next[1];
- next = strchr(slink, ' ');
- }
- if (slink[0] != '\0')
- udev_device_add_devlink(udev_device, slink);
- } else if (startswith(property, "TAGS=")) {
- char tags[UTIL_PATH_SIZE];
- char *next;
-
- strscpy(tags, sizeof(tags), &property[5]);
- next = strchr(tags, ':');
- if (next != NULL) {
- next++;
- while (next[0] != '\0') {
- char *tag;
-
- tag = next;
- next = strchr(tag, ':');
- if (next == NULL)
- break;
- next[0] = '\0';
- next++;
- udev_device_add_tag(udev_device, tag);
- }
- }
- } else if (startswith(property, "USEC_INITIALIZED=")) {
- udev_device_set_usec_initialized(udev_device, strtoull(&property[19], NULL, 10));
- } else if (startswith(property, "DRIVER=")) {
- udev_device_set_driver(udev_device, &property[7]);
- } else if (startswith(property, "ACTION=")) {
- udev_device_set_action(udev_device, &property[7]);
- } else if (startswith(property, "MAJOR=")) {
- udev_device->maj = strtoull(&property[6], NULL, 10);
- } else if (startswith(property, "MINOR=")) {
- udev_device->min = strtoull(&property[6], NULL, 10);
- } else if (startswith(property, "DEVPATH_OLD=")) {
- udev_device_set_devpath_old(udev_device, &property[12]);
- } else if (startswith(property, "SEQNUM=")) {
- udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
- } else if (startswith(property, "IFINDEX=")) {
- udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
- } else if (startswith(property, "DEVMODE=")) {
- udev_device_set_devnode_mode(udev_device, strtoul(&property[8], NULL, 8));
- } else if (startswith(property, "DEVUID=")) {
- udev_device_set_devnode_uid(udev_device, strtoul(&property[7], NULL, 10));
- } else if (startswith(property, "DEVGID=")) {
- udev_device_set_devnode_gid(udev_device, strtoul(&property[7], NULL, 10));
- } else {
- udev_device_add_property_from_string(udev_device, property);
}
-}
-
-static int udev_device_add_property_from_string_parse_finish(struct udev_device *udev_device)
-{
- if (udev_device->maj > 0)
- udev_device_set_devnum(udev_device, makedev(udev_device->maj, udev_device->min));
- udev_device->maj = 0;
- udev_device->min = 0;
- if (udev_device->devpath == NULL || udev_device->subsystem == NULL)
- return -EINVAL;
- return 0;
+ return subsystem;
}
/**
@@ -582,162 +194,36 @@ static int udev_device_add_property_from_string_parse_finish(struct udev_device
**/
_public_ const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key)
{
- struct udev_list_entry *list_entry;
-
- if (udev_device == NULL)
- return NULL;
- if (key == NULL)
- return NULL;
-
- list_entry = udev_device_get_properties_list_entry(udev_device);
- list_entry = udev_list_entry_get_by_name(list_entry, key);
- return udev_list_entry_get_value(list_entry);
-}
-
-static int udev_device_read_db(struct udev_device *udev_device)
-{
- char filename[UTIL_PATH_SIZE];
- char line[UTIL_LINE_SIZE];
- const char *id;
- FILE *f;
-
- if (udev_device->db_loaded)
- return 0;
-
- udev_device->db_loaded = true;
-
- id = udev_device_get_id_filename(udev_device);
- if (id == NULL)
- return -1;
-
- strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
-
- f = fopen(filename, "re");
- if (f == NULL)
- return log_debug_errno(errno, "no db file to read %s: %m", filename);
-
- /* devices with a database entry are initialized */
- udev_device->is_initialized = true;
-
- while (fgets(line, sizeof(line), f)) {
- ssize_t len;
- const char *val;
- struct udev_list_entry *entry;
-
- len = strlen(line);
- if (len < 4)
- break;
- line[len-1] = '\0';
- val = &line[2];
- switch(line[0]) {
- case 'S':
- strscpyl(filename, sizeof(filename), "/dev/", val, NULL);
- udev_device_add_devlink(udev_device, filename);
- break;
- case 'L':
- udev_device_set_devlink_priority(udev_device, atoi(val));
- break;
- case 'E':
- entry = udev_device_add_property_from_string(udev_device, val);
- udev_list_entry_set_num(entry, true);
- break;
- case 'G':
- udev_device_add_tag(udev_device, val);
- break;
- case 'W':
- udev_device_set_watch_handle(udev_device, atoi(val));
- break;
- case 'I':
- udev_device_set_usec_initialized(udev_device, strtoull(val, NULL, 10));
- break;
- }
- }
- fclose(f);
-
- log_trace("device %p filled with db file data", udev_device);
- return 0;
-}
-
-static int udev_device_read_uevent_file(struct udev_device *udev_device)
-{
- char filename[UTIL_PATH_SIZE];
- FILE *f;
- char line[UTIL_LINE_SIZE];
- int maj = 0;
- int min = 0;
+ const char *value = NULL;
+ int r;
- if (udev_device->uevent_loaded)
- return 0;
+ assert_return_errno(udev_device && key, NULL, EINVAL);
- strscpyl(filename, sizeof(filename), udev_device->syspath, "/uevent", NULL);
- f = fopen(filename, "re");
- if (f == NULL)
- return -errno;
- udev_device->uevent_loaded = true;
-
- while (fgets(line, sizeof(line), f)) {
- char *pos;
-
- pos = strchr(line, '\n');
- if (pos == NULL)
- continue;
- pos[0] = '\0';
-
- if (startswith(line, "DEVTYPE=")) {
- udev_device_set_devtype(udev_device, &line[8]);
- continue;
- }
- if (startswith(line, "IFINDEX=")) {
- udev_device_set_ifindex(udev_device, strtoull(&line[8], NULL, 10));
- continue;
- }
- if (startswith(line, "DEVNAME=")) {
- udev_device_set_devnode(udev_device, &line[8]);
- continue;
- }
-
- if (startswith(line, "MAJOR="))
- maj = strtoull(&line[6], NULL, 10);
- else if (startswith(line, "MINOR="))
- min = strtoull(&line[6], NULL, 10);
- else if (startswith(line, "DEVMODE="))
- udev_device->devnode_mode = strtoul(&line[8], NULL, 8);
-
- udev_device_add_property_from_string(udev_device, line);
+ r = sd_device_get_property_value(udev_device->device, key, &value);
+ if (r < 0) {
+ errno = -r;
+ return NULL;
}
- udev_device->devnum = makedev(maj, min);
- fclose(f);
- return 0;
-}
-
-void udev_device_set_info_loaded(struct udev_device *device)
-{
- device->info_loaded = true;
+ return value;
}
-static struct udev_device *udev_device_new(struct udev *udev)
-{
+struct udev_device *udev_device_new(struct udev *udev) {
struct udev_device *udev_device;
- if (udev == NULL) {
- errno = EINVAL;
- return NULL;
- }
+ assert_return_errno(udev, NULL, EINVAL);
udev_device = new0(struct udev_device, 1);
- if (udev_device == NULL) {
+ if (!udev_device) {
errno = ENOMEM;
return NULL;
}
udev_device->refcount = 1;
udev_device->udev = udev;
- udev_list_init(udev, &udev_device->devlinks_list, true);
- udev_list_init(udev, &udev_device->properties_list, true);
- udev_list_init(udev, &udev_device->sysattr_value_list, true);
- udev_list_init(udev, &udev_device->sysattr_list, false);
- udev_list_init(udev, &udev_device->tags_list, true);
- udev_device->watch_handle = -1;
+ udev_list_init(udev, &udev_device->properties, true);
+ udev_list_init(udev, &udev_device->tags, true);
+ udev_list_init(udev, &udev_device->sysattrs, true);
+ udev_list_init(udev, &udev_device->devlinks, true);
return udev_device;
}
@@ -756,68 +242,21 @@ static struct udev_device *udev_device_new(struct udev *udev)
*
* Returns: a new udev device, or #NULL, if it does not exist
**/
-_public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath)
-{
- const char *subdir;
- char path[UTIL_PATH_SIZE];
- char *pos;
- struct stat statbuf;
+_public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath) {
struct udev_device *udev_device;
+ int r;
- if (udev == NULL) {
- errno = EINVAL;
- return NULL;
- }
-
- if (syspath == NULL) {
- errno = EINVAL;
- return NULL;
- }
-
- /* path starts in sys */
- if (!startswith(syspath, "/sys")) {
- log_debug("not in sys :%s", syspath);
- errno = EINVAL;
+ udev_device = udev_device_new(udev);
+ if (!udev_device)
return NULL;
- }
- /* path is not a root directory */
- subdir = syspath + strlen("/sys");
- pos = strrchr(subdir, '/');
- if (pos == NULL || pos[1] == '\0' || pos < &subdir[2]) {
- errno = EINVAL;
+ r = sd_device_new_from_syspath(&udev_device->device, syspath);
+ if (r < 0) {
+ errno = -r;
+ udev_device_unref(udev_device);
return NULL;
}
- /* resolve possible symlink to real path */
- strscpy(path, sizeof(path), syspath);
- util_resolve_sys_link(udev, path, sizeof(path));
-
- if (startswith(path + strlen("/sys"), "/devices/")) {
- char file[UTIL_PATH_SIZE];
-
- /* all "devices" require a "uevent" file */
- strscpyl(file, sizeof(file), path, "/uevent", NULL);
- if (stat(file, &statbuf) != 0)
- return NULL;
- } else {
- /* everything else just needs to be a directory */
- if (stat(path, &statbuf) != 0)
- return NULL;
-
- if (!S_ISDIR(statbuf.st_mode)) {
- errno = EISDIR;
- return NULL;
- }
- }
-
- udev_device = udev_device_new(udev);
- if (udev_device == NULL)
- return NULL;
-
- udev_device_set_syspath(udev_device, path);
- log_trace("device %p has devpath '%s'", udev_device, udev_device_get_devpath(udev_device));
-
return udev_device;
}
@@ -839,22 +278,21 @@ _public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con
**/
_public_ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum)
{
- char path[UTIL_PATH_SIZE];
- const char *type_str;
-
- if (type == 'b')
- type_str = "block";
- else if (type == 'c')
- type_str = "char";
- else {
- errno = EINVAL;
+ struct udev_device *udev_device;
+ int r;
+
+ udev_device = udev_device_new(udev);
+ if (!udev_device)
+ return NULL;
+
+ r = sd_device_new_from_devnum(&udev_device->device, type, devnum);
+ if (r < 0) {
+ errno = -r;
+ udev_device_unref(udev_device);
return NULL;
}
- /* use /sys/dev/{block,char}/<maj>:<min> link */
- snprintf(path, sizeof(path), "/sys/dev/%s/%u:%u",
- type_str, major(devnum), minor(devnum));
- return udev_device_new_from_syspath(udev, path);
+ return udev_device;
}
/**
@@ -877,65 +315,21 @@ _public_ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char
**/
_public_ struct udev_device *udev_device_new_from_device_id(struct udev *udev, const char *id)
{
- char type;
- int maj, min;
- char subsys[UTIL_PATH_SIZE];
- char *sysname;
-
- switch(id[0]) {
- case 'b':
- case 'c':
- if (sscanf(id, "%c%i:%i", &type, &maj, &min) != 3)
- return NULL;
- return udev_device_new_from_devnum(udev, type, makedev(maj, min));
- case 'n': {
- int sk;
- struct ifreq ifr;
- struct udev_device *dev;
- int ifindex;
-
- ifindex = strtoul(&id[1], NULL, 10);
- if (ifindex <= 0) {
- errno = EINVAL;
- return NULL;
- }
-
- sk = socket(PF_INET, SOCK_DGRAM, 0);
- if (sk < 0)
- return NULL;
- memzero(&ifr, sizeof(struct ifreq));
- ifr.ifr_ifindex = ifindex;
- if (ioctl(sk, SIOCGIFNAME, &ifr) != 0) {
- close(sk);
- return NULL;
- }
- close(sk);
-
- dev = udev_device_new_from_subsystem_sysname(udev, "net", ifr.ifr_name);
- if (dev == NULL)
- return NULL;
- if (udev_device_get_ifindex(dev) == ifindex)
- return dev;
-
- /* this is racy, so we may end up with the wrong device */
- udev_device_unref(dev);
- errno = ENODEV;
+ struct udev_device *udev_device;
+ int r;
+
+ udev_device = udev_device_new(udev);
+ if (!udev_device)
return NULL;
- }
- case '+':
- strscpy(subsys, sizeof(subsys), &id[1]);
- sysname = strchr(subsys, ':');
- if (sysname == NULL) {
- errno = EINVAL;
- return NULL;
- }
- sysname[0] = '\0';
- sysname = &sysname[1];
- return udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
- default:
- errno = EINVAL;
+
+ r = sd_device_new_from_device_id(&udev_device->device, id);
+ if (r < 0) {
+ errno = -r;
+ udev_device_unref(udev_device);
return NULL;
}
+
+ return udev_device;
}
/**
@@ -955,69 +349,21 @@ _public_ struct udev_device *udev_device_new_from_device_id(struct udev *udev, c
**/
_public_ struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname)
{
- char path[UTIL_PATH_SIZE];
- struct stat statbuf;
-
- if (streq(subsystem, "subsystem")) {
- strscpyl(path, sizeof(path), "/sys/subsystem/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
-
- strscpyl(path, sizeof(path), "/sys/bus/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
-
- strscpyl(path, sizeof(path), "/sys/class/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
- goto out;
- }
-
- if (streq(subsystem, "module")) {
- strscpyl(path, sizeof(path), "/sys/module/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
- goto out;
- }
-
- if (streq(subsystem, "drivers")) {
- char subsys[UTIL_NAME_SIZE];
- char *driver;
-
- strscpy(subsys, sizeof(subsys), sysname);
- driver = strchr(subsys, ':');
- if (driver != NULL) {
- driver[0] = '\0';
- driver = &driver[1];
-
- strscpyl(path, sizeof(path), "/sys/subsystem/", subsys, "/drivers/", driver, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
+ struct udev_device *udev_device;
+ int r;
- strscpyl(path, sizeof(path), "/sys/bus/", subsys, "/drivers/", driver, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
- } else
- errno = EINVAL;
+ udev_device = udev_device_new(udev);
+ if (!udev_device)
+ return NULL;
- goto out;
+ r = sd_device_new_from_subsystem_sysname(&udev_device->device, subsystem, sysname);
+ if (r < 0) {
+ errno = -r;
+ udev_device_unref(udev_device);
+ return NULL;
}
- strscpyl(path, sizeof(path), "/sys/subsystem/", subsystem, "/devices/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
-
- strscpyl(path, sizeof(path), "/sys/bus/", subsystem, "/devices/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
-
- strscpyl(path, sizeof(path), "/sys/class/", subsystem, "/", sysname, NULL);
- if (stat(path, &statbuf) == 0)
- goto found;
-out:
- return NULL;
-found:
- return udev_device_new_from_syspath(udev, path);
+ return udev_device;
}
/**
@@ -1036,48 +382,45 @@ found:
**/
_public_ struct udev_device *udev_device_new_from_environment(struct udev *udev)
{
- int i;
struct udev_device *udev_device;
+ int r;
udev_device = udev_device_new(udev);
- if (udev_device == NULL)
+ if (!udev_device)
return NULL;
- udev_device_set_info_loaded(udev_device);
-
- for (i = 0; environ[i] != NULL; i++)
- udev_device_add_property_from_string_parse(udev_device, environ[i]);
- if (udev_device_add_property_from_string_parse_finish(udev_device) < 0) {
- log_debug("missing values, invalid device");
+ r = device_new_from_strv(&udev_device->device, environ);
+ if (r < 0) {
+ errno = -r;
udev_device_unref(udev_device);
- udev_device = NULL;
+ return NULL;
}
return udev_device;
}
-static struct udev_device *device_new_from_parent(struct udev_device *udev_device)
+static struct udev_device *device_new_from_parent(struct udev_device *child)
{
- struct udev_device *udev_device_parent = NULL;
- char path[UTIL_PATH_SIZE];
- const char *subdir;
-
- strscpy(path, sizeof(path), udev_device->syspath);
- subdir = path + strlen("/sys/");
- for (;;) {
- char *pos;
-
- pos = strrchr(subdir, '/');
- if (pos == NULL || pos < &subdir[2])
- break;
- pos[0] = '\0';
- udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path);
- if (udev_device_parent != NULL)
- return udev_device_parent;
+ struct udev_device *parent;
+ int r;
+
+ assert_return_errno(child, NULL, EINVAL);
+
+ parent = udev_device_new(child->udev);
+ if (!parent)
+ return NULL;
+
+ r = sd_device_get_parent(child->device, &parent->device);
+ if (r < 0) {
+ errno = -r;
+ udev_device_unref(parent);
+ return NULL;
}
- errno = ENOENT;
- return NULL;
+ /* the parent is unref'ed with the child, so take a ref from libudev as well */
+ sd_device_ref(parent->device);
+
+ return parent;
}
/**
@@ -1100,15 +443,15 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
**/
_public_ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
{
- if (udev_device == NULL) {
- errno = EINVAL;
- return NULL;
- }
+ assert_return_errno(udev_device, NULL, EINVAL);
+
if (!udev_device->parent_set) {
udev_device->parent_set = true;
- udev_device->parent_device = device_new_from_parent(udev_device);
+ udev_device->parent = device_new_from_parent(udev_device);
}
- return udev_device->parent_device;
+
+ /* TODO: errno will differ here in case parent == NULL */
+ return udev_device->parent;
}
/**
@@ -1134,33 +477,30 @@ _public_ struct udev_device *udev_device_get_parent(struct udev_device *udev_dev
**/
_public_ struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype)
{
- struct udev_device *parent;
+ sd_device *parent;
+ int r;
- if (subsystem == NULL) {
- errno = EINVAL;
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ /* this relies on the fact that finding the subdevice of a parent or the
+ parent of a subdevice commute */
+
+ /* first find the correct sd_device */
+ r = sd_device_get_parent_with_subsystem_devtype(udev_device->device, subsystem, devtype, &parent);
+ if (r < 0) {
+ errno = -r;
return NULL;
}
- parent = udev_device_get_parent(udev_device);
- while (parent != NULL) {
- const char *parent_subsystem;
- const char *parent_devtype;
-
- parent_subsystem = udev_device_get_subsystem(parent);
- if (parent_subsystem != NULL && streq(parent_subsystem, subsystem)) {
- if (devtype == NULL)
- break;
- parent_devtype = udev_device_get_devtype(parent);
- if (parent_devtype != NULL && streq(parent_devtype, devtype))
- break;
- }
- parent = udev_device_get_parent(parent);
+ /* then walk the chain of udev_device parents until the correspanding
+ one is found */
+ while ((udev_device = udev_device_get_parent(udev_device))) {
+ if (udev_device->device == parent)
+ return udev_device;
}
- if (!parent)
- errno = ENOENT;
-
- return parent;
+ errno = ENOENT;
+ return NULL;
}
/**
@@ -1173,8 +513,8 @@ _public_ struct udev_device *udev_device_get_parent_with_subsystem_devtype(struc
**/
_public_ struct udev *udev_device_get_udev(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return NULL;
+ assert_return_errno(udev_device, NULL, EINVAL);
+
return udev_device->udev;
}
@@ -1188,9 +528,9 @@ _public_ struct udev *udev_device_get_udev(struct udev_device *udev_device)
**/
_public_ struct udev_device *udev_device_ref(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return NULL;
- udev_device->refcount++;
+ if (udev_device)
+ udev_device->refcount++;
+
return udev_device;
}
@@ -1205,30 +545,18 @@ _public_ struct udev_device *udev_device_ref(struct udev_device *udev_device)
**/
_public_ struct udev_device *udev_device_unref(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return NULL;
- udev_device->refcount--;
- if (udev_device->refcount > 0)
- return NULL;
- if (udev_device->parent_device != NULL)
- udev_device_unref(udev_device->parent_device);
- free(udev_device->syspath);
- free(udev_device->sysname);
- free(udev_device->devnode);
- free(udev_device->subsystem);
- free(udev_device->devtype);
- udev_list_cleanup(&udev_device->devlinks_list);
- udev_list_cleanup(&udev_device->properties_list);
- udev_list_cleanup(&udev_device->sysattr_value_list);
- udev_list_cleanup(&udev_device->sysattr_list);
- udev_list_cleanup(&udev_device->tags_list);
- free(udev_device->action);
- free(udev_device->driver);
- free(udev_device->devpath_old);
- free(udev_device->id_filename);
- free(udev_device->envp);
- free(udev_device->monitor_buf);
- free(udev_device);
+ if (udev_device && (-- udev_device->refcount) == 0) {
+ sd_device_unref(udev_device->device);
+ udev_device_unref(udev_device->parent);
+
+ udev_list_cleanup(&udev_device->properties);
+ udev_list_cleanup(&udev_device->sysattrs);
+ udev_list_cleanup(&udev_device->tags);
+ udev_list_cleanup(&udev_device->devlinks);
+
+ free(udev_device);
+ }
+
return NULL;
}
@@ -1243,9 +571,18 @@ _public_ struct udev_device *udev_device_unref(struct udev_device *udev_device)
**/
_public_ const char *udev_device_get_devpath(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ const char *devpath;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_devpath(udev_device->device, &devpath);
+ if (r < 0) {
+ errno = -r;
return NULL;
- return udev_device->devpath;
+ }
+
+ return devpath;
}
/**
@@ -1259,9 +596,18 @@ _public_ const char *udev_device_get_devpath(struct udev_device *udev_device)
**/
_public_ const char *udev_device_get_syspath(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ const char *syspath;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_syspath(udev_device->device, &syspath);
+ if (r < 0) {
+ errno = -r;
return NULL;
- return udev_device->syspath;
+ }
+
+ return syspath;
}
/**
@@ -1274,9 +620,18 @@ _public_ const char *udev_device_get_syspath(struct udev_device *udev_device)
**/
_public_ const char *udev_device_get_sysname(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ const char *sysname;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_sysname(udev_device->device, &sysname);
+ if (r < 0) {
+ errno = -r;
return NULL;
- return udev_device->sysname;
+ }
+
+ return sysname;
}
/**
@@ -1289,9 +644,18 @@ _public_ const char *udev_device_get_sysname(struct udev_device *udev_device)
**/
_public_ const char *udev_device_get_sysnum(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ const char *sysnum;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_sysnum(udev_device->device, &sysnum);
+ if (r < 0) {
+ errno = -r;
return NULL;
- return udev_device->sysnum;
+ }
+
+ return sysnum;
}
/**
@@ -1305,13 +669,18 @@ _public_ const char *udev_device_get_sysnum(struct udev_device *udev_device)
**/
_public_ const char *udev_device_get_devnode(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ const char *devnode;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_devname(udev_device->device, &devnode);
+ if (r < 0) {
+ errno = -r;
return NULL;
- if (udev_device->devnode != NULL)
- return udev_device->devnode;
- if (!udev_device->info_loaded)
- udev_device_read_uevent_file(udev_device);
- return udev_device->devnode;
+ }
+
+ return devnode;
}
/**
@@ -1329,21 +698,24 @@ _public_ const char *udev_device_get_devnode(struct udev_device *udev_device)
**/
_public_ struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return NULL;
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- return udev_list_get_entry(&udev_device->devlinks_list);
-}
+ assert_return_errno(udev_device, NULL, EINVAL);
-void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
-{
- udev_device->devlinks_uptodate = false;
- udev_list_cleanup(&udev_device->devlinks_list);
+ if (device_get_devlinks_generation(udev_device->device) != udev_device->devlinks_generation) {
+ const char *devlink;
+
+ udev_list_cleanup(&udev_device->devlinks);
+
+ FOREACH_DEVICE_DEVLINK(udev_device->device, devlink)
+ udev_list_entry_add(&udev_device->devlinks, devlink, NULL);
+
+ udev_device->devlinks_generation = device_get_devlinks_generation(udev_device->device);
+ }
+
+ return udev_list_get_entry(&udev_device->devlinks);
}
/**
- * udev_device_get_properties_list_entry:
+ * udev_device_get_event_properties_entry:
* @udev_device: udev device
*
* Retrieve the list of key/value device properties of the udev
@@ -1356,45 +728,20 @@ void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
**/
_public_ struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return NULL;
- if (!udev_device->info_loaded) {
- udev_device_read_uevent_file(udev_device);
- udev_device_read_db(udev_device);
- }
- if (!udev_device->devlinks_uptodate) {
- char symlinks[UTIL_PATH_SIZE];
- struct udev_list_entry *list_entry;
-
- udev_device->devlinks_uptodate = true;
- list_entry = udev_device_get_devlinks_list_entry(udev_device);
- if (list_entry != NULL) {
- char *s;
- size_t l;
-
- s = symlinks;
- l = strpcpyl(&s, sizeof(symlinks), udev_list_entry_get_name(list_entry), NULL);
- udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry))
- l = strpcpyl(&s, l, " ", udev_list_entry_get_name(list_entry), NULL);
- udev_device_add_property_internal(udev_device, "DEVLINKS", symlinks);
- }
- }
- if (!udev_device->tags_uptodate) {
- udev_device->tags_uptodate = true;
- if (udev_device_get_tags_list_entry(udev_device) != NULL) {
- char tags[UTIL_PATH_SIZE];
- struct udev_list_entry *list_entry;
- char *s;
- size_t l;
-
- s = tags;
- l = strpcpyl(&s, sizeof(tags), ":", NULL);
- udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(udev_device))
- l = strpcpyl(&s, l, udev_list_entry_get_name(list_entry), ":", NULL);
- udev_device_add_property_internal(udev_device, "TAGS", tags);
- }
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ if (device_get_properties_generation(udev_device->device) != udev_device->properties_generation) {
+ const char *key, *value;
+
+ udev_list_cleanup(&udev_device->properties);
+
+ FOREACH_DEVICE_PROPERTY(udev_device->device, key, value)
+ udev_list_entry_add(&udev_device->properties, key, value);
+
+ udev_device->properties_generation = device_get_properties_generation(udev_device->device);
}
- return udev_list_get_entry(&udev_device->properties_list);
+
+ return udev_list_get_entry(&udev_device->properties);
}
/**
@@ -1407,11 +754,19 @@ _public_ struct udev_list_entry *udev_device_get_properties_list_entry(struct ud
*
* Returns: the kernel action value, or #NULL if there is no action value available.
**/
-_public_ const char *udev_device_get_action(struct udev_device *udev_device)
-{
- if (udev_device == NULL)
+_public_ const char *udev_device_get_action(struct udev_device *udev_device) {
+ const char *action = NULL;
+ int r;
+
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ r = sd_device_get_property_value(udev_device->device, "ACTION", &action);
+ if (r < 0 && r != -ENOENT) {
+ errno = -r;
return NULL;
- return udev_device->action;
+ }
+
+ return action;
}
/**
@@ -1428,23 +783,18 @@ _public_ const char *udev_device_get_action(struct udev_device *udev_device)
**/
_public_ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device *udev_device)
{
- usec_t now_ts;
+ usec_t ts;
+ int r;
- if (udev_device == NULL)
- return 0;
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- if (udev_device->usec_initialized == 0)
- return 0;
- now_ts = now(CLOCK_MONOTONIC);
- if (now_ts == 0)
+ assert_return(udev_device, -EINVAL);
+
+ r = sd_device_get_usec_since_initialized(udev_device->device, &ts);
+ if (r < 0) {
+ errno = EINVAL;
return 0;
- return now_ts - udev_device->usec_initialized;
-}
+ }
-usec_t udev_device_get_usec_initialized(struct udev_device *udev_device)
-{
- return udev_device->usec_initialized;
+ return ts;
}
/**
@@ -1459,76 +809,18 @@ usec_t udev_device_get_usec_initialized(struct udev_device *udev_device)
**/
_public_ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr)
{
- struct udev_list_entry *list_entry;
- char path[UTIL_PATH_SIZE];
- char value[4096];
- struct stat statbuf;
- int fd;
- ssize_t size;
- const char *val = NULL;
-
- if (udev_device == NULL)
- return NULL;
- if (sysattr == NULL)
- return NULL;
+ const char *value;
+ int r;
- /* look for possibly already cached result */
- list_entry = udev_list_get_entry(&udev_device->sysattr_value_list);
- list_entry = udev_list_entry_get_by_name(list_entry, sysattr);
- if (list_entry != NULL)
- return udev_list_entry_get_value(list_entry);
+ assert_return_errno(udev_device, NULL, EINVAL);
- strscpyl(path, sizeof(path), udev_device_get_syspath(udev_device), "/", sysattr, NULL);
- if (lstat(path, &statbuf) != 0) {
- udev_list_entry_add(&udev_device->sysattr_value_list, sysattr, NULL);
- goto out;
- }
-
- if (S_ISLNK(statbuf.st_mode)) {
- /*
- * Some core links return only the last element of the target path,
- * these are just values, the paths should not be exposed.
- */
- if (streq(sysattr, "driver") ||
- streq(sysattr, "subsystem") ||
- streq(sysattr, "module")) {
- if (util_get_sys_core_link_value(udev_device->udev, sysattr,
- udev_device->syspath, value, sizeof(value)) < 0)
- return NULL;
- list_entry = udev_list_entry_add(&udev_device->sysattr_value_list, sysattr, value);
- val = udev_list_entry_get_value(list_entry);
- goto out;
- }
-
- goto out;
+ r = sd_device_get_sysattr_value(udev_device->device, sysattr, &value);
+ if (r < 0) {
+ errno = -r;
+ return NULL;
}
- /* skip directories */
- if (S_ISDIR(statbuf.st_mode))
- goto out;
-
- /* skip non-readable files */
- if ((statbuf.st_mode & S_IRUSR) == 0)
- goto out;
-
- /* read attribute value */
- fd = open(path, O_RDONLY|O_CLOEXEC);
- if (fd < 0)
- goto out;
- size = read(fd, value, sizeof(value));
- close(fd);
- if (size < 0)
- goto out;
- if (size == sizeof(value))
- goto out;
-
- /* got a valid value, store it in cache and return it */
- value[size] = '\0';
- util_remove_trailing_chars(value, '\n');
- list_entry = udev_list_entry_add(&udev_device->sysattr_value_list, sysattr, value);
- val = udev_list_entry_get_value(list_entry);
-out:
- return val;
+ return value;
}
/**
@@ -1543,116 +835,15 @@ out:
**/
_public_ int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value)
{
- struct udev_device *dev;
- char path[UTIL_PATH_SIZE];
- struct stat statbuf;
- int fd;
- ssize_t size, value_len;
- int ret = 0;
-
- if (udev_device == NULL)
- return -EINVAL;
- dev = udev_device;
- if (sysattr == NULL)
- return -EINVAL;
- if (value == NULL)
- value_len = 0;
- else
- value_len = strlen(value);
-
- strscpyl(path, sizeof(path), udev_device_get_syspath(dev), "/", sysattr, NULL);
- if (lstat(path, &statbuf) != 0) {
- udev_list_entry_add(&dev->sysattr_value_list, sysattr, NULL);
- ret = -ENXIO;
- goto out;
- }
-
- if (S_ISLNK(statbuf.st_mode)) {
- ret = -EINVAL;
- goto out;
- }
-
- /* skip directories */
- if (S_ISDIR(statbuf.st_mode)) {
- ret = -EISDIR;
- goto out;
- }
-
- /* skip non-readable files */
- if ((statbuf.st_mode & S_IRUSR) == 0) {
- ret = -EACCES;
- goto out;
- }
-
- /* Value is limited to 4k */
- if (value_len > 4096) {
- ret = -EINVAL;
- goto out;
- }
- util_remove_trailing_chars(value, '\n');
-
- /* write attribute value */
- fd = open(path, O_WRONLY|O_CLOEXEC);
- if (fd < 0) {
- ret = -errno;
- goto out;
- }
- size = write(fd, value, value_len);
- close(fd);
- if (size < 0) {
- ret = -errno;
- goto out;
- }
- if (size < value_len) {
- ret = -EIO;
- goto out;
- }
-
- /* wrote a valid value, store it in cache and return it */
- udev_list_entry_add(&dev->sysattr_value_list, sysattr, value);
-out:
- if (dev != udev_device)
- udev_device_unref(dev);
- return ret;
-}
-
-static int udev_device_sysattr_list_read(struct udev_device *udev_device)
-{
- struct dirent *dent;
- DIR *dir;
- int num = 0;
-
- if (udev_device == NULL)
- return -EINVAL;
- if (udev_device->sysattr_list_read)
- return 0;
-
- dir = opendir(udev_device_get_syspath(udev_device));
- if (!dir)
- return -errno;
-
- for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
- char path[UTIL_PATH_SIZE];
- struct stat statbuf;
-
- /* only handle symlinks and regular files */
- if (dent->d_type != DT_LNK && dent->d_type != DT_REG)
- continue;
+ int r;
- strscpyl(path, sizeof(path), udev_device_get_syspath(udev_device), "/", dent->d_name, NULL);
- if (lstat(path, &statbuf) != 0)
- continue;
- if ((statbuf.st_mode & S_IRUSR) == 0)
- continue;
+ assert_return(udev_device, -EINVAL);
- udev_list_entry_add(&udev_device->sysattr_list, dent->d_name, NULL);
- num++;
- }
-
- closedir(dir);
- udev_device->sysattr_list_read = true;
+ r = sd_device_set_sysattr_value(udev_device->device, sysattr, value);
+ if (r < 0)
+ return r;
- return num;
+ return 0;
}
/**
@@ -1667,74 +858,20 @@ static int udev_device_sysattr_list_read(struct udev_device *udev_device)
**/
_public_ struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device)
{
- if (!udev_device->sysattr_list_read) {
- int ret;
- ret = udev_device_sysattr_list_read(udev_device);
- if (0 > ret)
- return NULL;
- }
+ assert_return_errno(udev_device, NULL, EINVAL);
- return udev_list_get_entry(&udev_device->sysattr_list);
-}
+ if (!udev_device->sysattrs_read) {
+ const char *sysattr;
-static int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode)
-{
- free(udev_device->devnode);
- if (devnode[0] != '/') {
- if (asprintf(&udev_device->devnode, "/dev/%s", devnode) < 0)
- udev_device->devnode = NULL;
- } else {
- udev_device->devnode = strdup(devnode);
- }
- if (udev_device->devnode == NULL)
- return -ENOMEM;
- udev_device_add_property_internal(udev_device, "DEVNAME", udev_device->devnode);
- return 0;
-}
+ udev_list_cleanup(&udev_device->sysattrs);
-int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink)
-{
- struct udev_list_entry *list_entry;
-
- udev_device->devlinks_uptodate = false;
- list_entry = udev_list_entry_add(&udev_device->devlinks_list, devlink, NULL);
- if (list_entry == NULL)
- return -ENOMEM;
- return 0;
-}
+ FOREACH_DEVICE_SYSATTR(udev_device->device, sysattr)
+ udev_list_entry_add(&udev_device->properties, sysattr, NULL);
-const char *udev_device_get_id_filename(struct udev_device *udev_device)
-{
- if (udev_device->id_filename == NULL) {
- if (udev_device_get_subsystem(udev_device) == NULL)
- return NULL;
-
- if (major(udev_device_get_devnum(udev_device)) > 0) {
- /* use dev_t -- b259:131072, c254:0 */
- if (asprintf(&udev_device->id_filename, "%c%u:%u",
- streq(udev_device_get_subsystem(udev_device), "block") ? 'b' : 'c',
- major(udev_device_get_devnum(udev_device)),
- minor(udev_device_get_devnum(udev_device))) < 0)
- udev_device->id_filename = NULL;
- } else if (udev_device_get_ifindex(udev_device) > 0) {
- /* use netdev ifindex -- n3 */
- if (asprintf(&udev_device->id_filename, "n%i", udev_device_get_ifindex(udev_device)) < 0)
- udev_device->id_filename = NULL;
- } else {
- /*
- * use $subsys:$syname -- pci:0000:00:1f.2
- * sysname() has '!' translated, get it from devpath
- */
- const char *sysname;
- sysname = strrchr(udev_device->devpath, '/');
- if (sysname == NULL)
- return NULL;
- sysname = &sysname[1];
- if (asprintf(&udev_device->id_filename, "+%s:%s", udev_device_get_subsystem(udev_device), sysname) < 0)
- udev_device->id_filename = NULL;
- }
+ udev_device->sysattrs_read = true;
}
- return udev_device->id_filename;
+
+ return udev_list_get_entry(&udev_device->sysattrs);
}
/**
@@ -1752,49 +889,18 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device)
**/
_public_ int udev_device_get_is_initialized(struct udev_device *udev_device)
{
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- return udev_device->is_initialized;
-}
+ int r, initialized;
-void udev_device_set_is_initialized(struct udev_device *udev_device)
-{
- udev_device->is_initialized = true;
-}
+ assert_return(udev_device, -EINVAL);
-static bool is_valid_tag(const char *tag)
-{
- return !strchr(tag, ':') && !strchr(tag, ' ');
-}
+ r = sd_device_get_is_initialized(udev_device->device, &initialized);
+ if (r < 0) {
+ errno = -r;
-int udev_device_add_tag(struct udev_device *udev_device, const char *tag)
-{
- if (!is_valid_tag(tag))
- return -EINVAL;
- udev_device->tags_uptodate = false;
- if (udev_list_entry_add(&udev_device->tags_list, tag, NULL) != NULL)
return 0;
- return -ENOMEM;
-}
-
-void udev_device_remove_tag(struct udev_device *udev_device, const char *tag)
-{
- struct udev_list_entry *e;
-
- if (!is_valid_tag(tag))
- return;
- e = udev_list_get_entry(&udev_device->tags_list);
- e = udev_list_entry_get_by_name(e, tag);
- if (e) {
- udev_device->tags_uptodate = false;
- udev_list_entry_delete(e);
}
-}
-void udev_device_cleanup_tags_list(struct udev_device *udev_device)
-{
- udev_device->tags_uptodate = false;
- udev_list_cleanup(&udev_device->tags_list);
+ return initialized;
}
/**
@@ -1810,11 +916,20 @@ void udev_device_cleanup_tags_list(struct udev_device *udev_device)
**/
_public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device)
{
- if (udev_device == NULL)
- return NULL;
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- return udev_list_get_entry(&udev_device->tags_list);
+ assert_return_errno(udev_device, NULL, EINVAL);
+
+ if (device_get_tags_generation(udev_device->device) != udev_device->tags_generation) {
+ const char *tag;
+
+ udev_list_cleanup(&udev_device->tags);
+
+ FOREACH_DEVICE_TAG(udev_device->device, tag)
+ udev_list_entry_add(&udev_device->tags, tag, NULL);
+
+ udev_device->tags_generation = device_get_tags_generation(udev_device->device);
+ }
+
+ return udev_list_get_entry(&udev_device->tags);
}
/**
@@ -1828,274 +943,7 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev
**/
_public_ int udev_device_has_tag(struct udev_device *udev_device, const char *tag)
{
- struct udev_list_entry *list_entry;
-
- if (udev_device == NULL)
- return false;
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- list_entry = udev_device_get_tags_list_entry(udev_device);
- if (udev_list_entry_get_by_name(list_entry, tag) != NULL)
- return true;
- return false;
-}
-
-#define ENVP_SIZE 128
-#define MONITOR_BUF_SIZE 4096
-static int update_envp_monitor_buf(struct udev_device *udev_device)
-{
- struct udev_list_entry *list_entry;
- char *s;
- size_t l;
- unsigned int i;
-
- /* monitor buffer of property strings */
- free(udev_device->monitor_buf);
- udev_device->monitor_buf_len = 0;
- udev_device->monitor_buf = malloc(MONITOR_BUF_SIZE);
- if (udev_device->monitor_buf == NULL)
- return -ENOMEM;
-
- /* envp array, strings will point into monitor buffer */
- if (udev_device->envp == NULL)
- udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE);
- if (udev_device->envp == NULL)
- return -ENOMEM;
-
- i = 0;
- s = udev_device->monitor_buf;
- l = MONITOR_BUF_SIZE;
- udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
- const char *key;
-
- key = udev_list_entry_get_name(list_entry);
- /* skip private variables */
- if (key[0] == '.')
- continue;
-
- /* add string to envp array */
- udev_device->envp[i++] = s;
- if (i+1 >= ENVP_SIZE)
- return -EINVAL;
-
- /* add property string to monitor buffer */
- l = strpcpyl(&s, l, key, "=", udev_list_entry_get_value(list_entry), NULL);
- if (l == 0)
- return -EINVAL;
- /* advance past the trailing '\0' that strpcpyl() guarantees */
- s++;
- l--;
- }
- udev_device->envp[i] = NULL;
- udev_device->monitor_buf_len = s - udev_device->monitor_buf;
- udev_device->envp_uptodate = true;
- return 0;
-}
-
-char **udev_device_get_properties_envp(struct udev_device *udev_device)
-{
- if (!udev_device->envp_uptodate)
- if (update_envp_monitor_buf(udev_device) != 0)
- return NULL;
- return udev_device->envp;
-}
-
-ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf)
-{
- if (!udev_device->envp_uptodate)
- if (update_envp_monitor_buf(udev_device) != 0)
- return -EINVAL;
- *buf = udev_device->monitor_buf;
- return udev_device->monitor_buf_len;
-}
-
-int udev_device_get_devlink_priority(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- return udev_device->devlink_priority;
-}
-
-int udev_device_set_devlink_priority(struct udev_device *udev_device, int prio)
-{
- udev_device->devlink_priority = prio;
- return 0;
-}
-
-int udev_device_get_watch_handle(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- udev_device_read_db(udev_device);
- return udev_device->watch_handle;
-}
-
-int udev_device_set_watch_handle(struct udev_device *udev_device, int handle)
-{
- udev_device->watch_handle = handle;
- return 0;
-}
-
-bool udev_device_get_db_persist(struct udev_device *udev_device)
-{
- return udev_device->db_persist;
-}
-
-void udev_device_set_db_persist(struct udev_device *udev_device)
-{
- udev_device->db_persist = true;
-}
-
-int udev_device_rename(struct udev_device *udev_device, const char *name)
-{
- _cleanup_free_ char *dirname = NULL;
- const char *interface;
- char *new_syspath;
- int r;
-
- if (udev_device == NULL || name == NULL)
- return -EINVAL;
-
- dirname = dirname_malloc(udev_device->syspath);
- if (!dirname)
- return -ENOMEM;
-
- new_syspath = strjoina(dirname, "/", name);
-
- r = udev_device_set_syspath(udev_device, new_syspath);
- if (r < 0)
- return r;
-
- interface = udev_device_get_property_value(udev_device, "INTERFACE");
- if (interface) {
- /* like DEVPATH_OLD, INTERFACE_OLD is not saved to the db, but only stays around for the current event */
- udev_device_add_property_internal(udev_device, "INTERFACE_OLD", interface);
- udev_device_add_property_internal(udev_device, "INTERFACE", name);
- }
-
- return 0;
-}
-
-struct udev_device *udev_device_shallow_clone(struct udev_device *old_device)
-{
- struct udev_device *device;
+ assert_return(udev_device, 0);
- if (old_device == NULL)
- return NULL;
-
- device = udev_device_new(old_device->udev);
- if (!device) {
- errno = ENOMEM;
-
- return NULL;
- }
-
- udev_device_set_syspath(device, udev_device_get_syspath(old_device));
- udev_device_set_subsystem(device, udev_device_get_subsystem(old_device));
- udev_device_set_devnum(device, udev_device_get_devnum(old_device));
-
- return device;
-}
-
-struct udev_device *udev_device_clone_with_db(struct udev_device *old_device)
-{
- struct udev_device *device;
-
- device = udev_device_shallow_clone(old_device);
- if (!device)
- return NULL;
-
- udev_device_read_db(device);
- udev_device_set_info_loaded(device);
-
- return device;
-}
-
-struct udev_device *udev_device_new_from_nulstr(struct udev *udev, char *nulstr, ssize_t buflen) {
- struct udev_device *device;
- ssize_t bufpos = 0;
-
- if (nulstr == NULL || buflen <= 0) {
- errno = EINVAL;
-
- return NULL;
- }
-
- device = udev_device_new(udev);
- if (!device) {
- errno = ENOMEM;
-
- return NULL;
- }
-
- udev_device_set_info_loaded(device);
-
- while (bufpos < buflen) {
- char *key;
- size_t keylen;
-
- key = nulstr + bufpos;
- keylen = strlen(key);
- if (keylen == 0)
- break;
-
- bufpos += keylen + 1;
- udev_device_add_property_from_string_parse(device, key);
- }
-
- if (udev_device_add_property_from_string_parse_finish(device) < 0) {
- log_debug("missing values, invalid device");
-
- udev_device_unref(device);
-
- errno = EINVAL;
-
- return NULL;
- }
-
- return device;
-}
-
-struct udev_device *udev_device_new_from_synthetic_event(struct udev *udev, const char *syspath, const char *action) {
- struct udev_device *ret;
- int r;
-
- if (!action) {
- errno = EINVAL;
- return NULL;
- }
-
- ret = udev_device_new_from_syspath(udev, syspath);
- if (!ret)
- return NULL;
-
- r = udev_device_read_uevent_file(ret);
- if (r < 0) {
- udev_device_unref(ret);
- errno = -r;
- return NULL;
- }
-
- r = udev_device_set_action(ret, action);
- if (r < 0) {
- udev_device_unref(ret);
- errno = -r;
- return NULL;
- }
-
- return ret;
-}
-
-int udev_device_copy_properties(struct udev_device *dst, struct udev_device *src) {
- struct udev_list_entry *entry;
-
- for ((entry = udev_device_get_properties_list_entry(src)); entry; entry = udev_list_entry_get_next(entry)) {
- const char *key, *value;
-
- key = udev_list_entry_get_name(entry);
- value = udev_list_entry_get_value(entry);
-
- udev_device_add_property(dst, key, value);
- }
-
- return 0;
+ return sd_device_has_tag(udev_device->device, tag);
}
--
2.3.4
More information about the systemd-devel
mailing list