diff options
Diffstat (limited to 'src/udev/udev-watch.c')
| -rw-r--r-- | src/udev/udev-watch.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 1091ec8d69..311f5bdf23 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2012 Kay Sievers <kay.sievers@vrfy.org> + * Copyright (C) 2004-2012 Kay Sievers <kay@vrfy.org> * Copyright (C) 2009 Canonical Ltd. * Copyright (C) 2009 Scott James Remnant <scott@netsplit.com> * @@ -75,7 +75,7 @@ void udev_watch_restore(struct udev *udev) goto unlink; device[len] = '\0'; - dev = udev_device_new_from_id_filename(udev, device); + dev = udev_device_new_from_device_id(udev, device); if (dev == NULL) goto unlink; @@ -98,6 +98,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) { char filename[UTIL_PATH_SIZE]; int wd; + int r; if (inotify_fd < 0) return; @@ -113,7 +114,9 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd); mkdir_parents(filename, 0755); unlink(filename); - symlink(udev_device_get_id_filename(dev), filename); + r = symlink(udev_device_get_id_filename(dev), filename); + if (r < 0) + log_error("Failed to create symlink: %m"); udev_device_set_watch_handle(dev, wd); } @@ -154,5 +157,5 @@ struct udev_device *udev_watch_lookup(struct udev *udev, int wd) return NULL; device[len] = '\0'; - return udev_device_new_from_id_filename(udev, device); + return udev_device_new_from_device_id(udev, device); } |