shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-31 07:51:08 +03:00
Code

fix $links substitution for devices without any link

Browse Source 
Reported-by: Michel Hermier <michel.hermier@gmail.com>
This commit is contained in:
Kay Sievers 2008-11-17 15:24:47 +01:00
parent c969f88062
commit 5375c80eba
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
udev/udev-event.c
View File

@ -231,8 +231,9 @@ found:
break;
case SUBST_DRIVER:
if (event->dev_parent != NULL) {
const char *driver = udev_device_get_driver(event->dev_parent);
const char *driver;
driver = udev_device_get_driver(event->dev_parent);
if (driver == NULL)
break;
util_strlcat(string, driver, maxsize);
@ -398,6 +399,8 @@ found:
struct udev_list_entry *list_entry;
list_entry = udev_device_get_devlinks_list_entry(dev);
if (list_entry == NULL)
break;
util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
util_strlcat(string, " ", maxsize);
@ -426,6 +429,8 @@ found:
if (list_entry == NULL)
break;
value = udev_list_entry_get_value(list_entry);
if (value == NULL)
break;
dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
util_strlcat(string, value, maxsize);
break;