shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

test: replace udev_device by sd_device in test-udev

Browse Source
This commit is contained in:
Yu Watanabe 2018-11-01 22:58:42 +09:00
parent 77ad202c72
commit b74a0b6ae7
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/test-udev.c
View File

@ -11,8 +11,8 @@
#include <sys/signalfd.h> #include <sys/signalfd.h>
#include <unistd.h> #include <unistd.h>
#include "device-private.h"
#include "fs-util.h" #include "fs-util.h"
#include "libudev-device-internal.h"
#include "log.h" #include "log.h"
#include "missing.h" #include "missing.h"
#include "selinux-util.h" #include "selinux-util.h"
@ -53,10 +53,11 @@ static int fake_filesystems(void) {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
_cleanup_(udev_event_freep) struct udev_event *event = NULL;
_cleanup_(udev_device_unrefp) struct udev_device *dev = NULL;
_cleanup_(udev_rules_unrefp) struct udev_rules *rules = NULL; _cleanup_(udev_rules_unrefp) struct udev_rules *rules = NULL;
const char *devpath, *action; _cleanup_(udev_event_freep) struct udev_event *event = NULL;
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
const char *devpath, *devname, *action;
int r;
test_setup_logging(LOG_INFO); test_setup_logging(LOG_INFO);
@ -77,31 +78,35 @@ int main(int argc, char *argv[]) {
rules = udev_rules_new(1); rules = udev_rules_new(1);
const char *syspath = strjoina("/sys", devpath); const char *syspath = strjoina("/sys", devpath);
dev = udev_device_new_from_synthetic_event(NULL, syspath, action); r = device_new_from_synthetic_event(&dev, syspath, action);
if (!dev) { if (r < 0) {
log_debug("unknown device '%s'", devpath); log_debug_errno(r, "Failed to open device '%s'", devpath);
goto out; goto out;
} }
assert_se(event = udev_event_new(dev->device, 0, NULL)); assert_se(event = udev_event_new(dev, 0, NULL));
assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, SIGHUP, SIGCHLD, -1) >= 0); assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, SIGHUP, SIGCHLD, -1) >= 0);
/* do what devtmpfs usually provides us */ /* do what devtmpfs usually provides us */
if (udev_device_get_devnode(dev)) { if (sd_device_get_devname(dev, &devname) >= 0) {
const char *subsystem;
mode_t mode = 0600; mode_t mode = 0600;
if (streq(udev_device_get_subsystem(dev), "block")) if (sd_device_get_subsystem(dev, &subsystem) >= 0 && streq(subsystem, "block"))
mode |= S_IFBLK; mode |= S_IFBLK;
else else
mode |= S_IFCHR; mode |= S_IFCHR;
if (!streq(action, "remove")) { if (!streq(action, "remove")) {
(void) mkdir_parents_label(udev_device_get_devnode(dev), 0755); dev_t devnum = makedev(0, 0);
assert_se(mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev)) == 0);
(void) mkdir_parents_label(devname, 0755);
(void) sd_device_get_devnum(dev, &devnum);
assert_se(mknod(devname, mode, devnum) == 0);
} else { } else {
assert_se(unlink(udev_device_get_devnode(dev)) == 0); assert_se(unlink(devname) == 0);
(void) rmdir_parents(udev_device_get_devnode(dev), "/"); (void) rmdir_parents(devname, "/");
} }
} }