shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-23 10:50:16 +03:00
Code

use sysname() for devices without a device node

Browse Source
This commit is contained in:
Kay Sievers 2012-01-24 04:29:59 +01:00
parent e483478115
commit e605cf7782
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/udev-event.c
View File

@ -349,12 +349,15 @@ subst:
case SUBST_NAME: {
if (event->name != NULL) {
l = util_strpcpy(&s, l, event->name);
dbg(event->udev, "substitute custom name '%s'\n", event->name);
} else {
dbg(event->udev, "substitute custom node name '%s'\n", event->name);
} else if (udev_device_get_devnode(dev) != NULL) {
size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
l = util_strpcpy(&s, l, &udev_device_get_devnode(dev)[devlen]);
dbg(event->udev, "substitute name'%s'\n", &udev_device_get_devnode(dev)[devlen]);
dbg(event->udev, "substitute node name'%s'\n", &udev_device_get_devnode(dev)[devlen]);
} else {
l = util_strpcpy(&s, l, udev_device_get_sysname(dev));
dbg(event->udev, "substitute device name'%s'\n", udev_device_get_sysname(dev));
}
break;
}