X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-watch.c;h=0ec8bfd62793cd9796d362b27d76acc08d9f500d;hb=c2e63452dda721bb7f127adefdfe444153a9bdca;hp=d333476346375a4e377f9031b1000f27ce5c77fc;hpb=4b09a2fc4383f191d96a8d6134b95a4b84aef931;p=elogind.git diff --git a/udev/udev-watch.c b/udev/udev-watch.c index d33347634..0ec8bfd62 100644 --- a/udev/udev-watch.c +++ b/udev/udev-watch.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Kay Sievers + * Copyright (C) 2004-2010 Kay Sievers * Copyright (C) 2009 Canonical Ltd. * Copyright (C) 2009 Scott James Remnant * @@ -26,27 +26,22 @@ #include #include #include -#ifdef HAVE_INOTIFY #include -#endif #include "udev.h" -int inotify_fd = -1; +static int inotify_fd = -1; /* inotify descriptor, will be shared with rules directory; * set to cloexec since we need our children to be able to add * watches for us */ -void udev_watch_init(struct udev *udev) +int udev_watch_init(struct udev *udev) { - inotify_fd = inotify_init(); - if (inotify_fd >= 0) - util_set_fd_cloexec(inotify_fd); - else if (errno == ENOSYS) - info(udev, "unable to use inotify, udevd will not monitor rule files changes\n"); - else + inotify_fd = inotify_init1(IN_CLOEXEC); + if (inotify_fd < 0) err(udev, "inotify_init failed: %m\n"); + return inotify_fd; } /* move any old watches directory out of the way, and then restore @@ -59,12 +54,8 @@ void udev_watch_restore(struct udev *udev) if (inotify_fd < 0) return; - util_strlcpy(oldname, udev_get_dev_path(udev), sizeof(oldname)); - util_strlcat(oldname, "/.udev/watch.old", sizeof(oldname)); - - util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - util_strlcat(filename, "/.udev/watch", sizeof(filename)); - + util_strscpyl(oldname, sizeof(oldname), udev_get_run_path(udev), "/watch.old", NULL); + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/watch", NULL); if (rename(filename, oldname) == 0) { DIR *dir; struct dirent *ent; @@ -75,39 +66,32 @@ void udev_watch_restore(struct udev *udev) return; } - while ((ent = readdir(dir)) != NULL) { - char path[UTIL_PATH_SIZE]; - char buf[UTIL_PATH_SIZE]; - ssize_t syslen; + for (ent = readdir(dir); ent != NULL; ent = readdir(dir)) { + char device[UTIL_PATH_SIZE]; + char *s; + size_t l; ssize_t len; struct udev_device *dev; - if (ent->d_name[0] < '0' || ent->d_name[0] > '9') + if (ent->d_name[0] == '.') continue; - util_strlcpy(path, oldname, sizeof(path)); - util_strlcat(path, "/", sizeof(path)); - util_strlcat(path, ent->d_name, sizeof(path)); + s = device; + l = util_strpcpy(&s, sizeof(device), udev_get_sys_path(udev)); + len = readlinkat(dirfd(dir), ent->d_name, s, l); + if (len <= 0 || len == (ssize_t)l) + goto unlink; + s[len] = '\0'; - syslen = util_strlcpy(buf, udev_get_sys_path(udev), sizeof(buf)); - len = readlink(path, &buf[syslen], sizeof(buf)-syslen); - if (len <= 0 || len >= (ssize_t)(sizeof(buf)-syslen)) { - unlink(path); - continue; - } - buf[syslen + len] = '\0'; - dbg(udev, "old watch to '%s' found\n", buf); - dev = udev_device_new_from_syspath(udev, buf); - if (dev == NULL) { - unlink(path); - continue; - } + dev = udev_device_new_from_id_filename(udev, s); + if (dev == NULL) + goto unlink; info(udev, "restoring old watch on '%s'\n", udev_device_get_devnode(dev)); udev_watch_begin(udev, dev); - udev_device_unref(dev); - unlink(path); +unlink: + unlinkat(dirfd(dir), ent->d_name, 0); } closedir(dir); @@ -131,12 +115,13 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) if (wd < 0) { err(udev, "inotify_add_watch(%d, %s, %o) failed: %m\n", inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); + return; } - snprintf(filename, sizeof(filename), "%s/.udev/watch/%d", udev_get_dev_path(udev), wd); + snprintf(filename, sizeof(filename), "%s/watch/%d", udev_get_run_path(udev), wd); util_create_path(udev, filename); unlink(filename); - symlink(udev_device_get_devpath(dev), filename); + symlink(udev_device_get_id_filename(dev), filename); udev_device_set_watch_handle(dev, wd); } @@ -156,7 +141,7 @@ void udev_watch_end(struct udev *udev, struct udev_device *dev) info(udev, "removing watch on '%s'\n", udev_device_get_devnode(dev)); inotify_rm_watch(inotify_fd, wd); - snprintf(filename, sizeof(filename), "%s/.udev/watch/%d", udev_get_dev_path(udev), wd); + snprintf(filename, sizeof(filename), "%s/watch/%d", udev_get_run_path(udev), wd); unlink(filename); udev_device_set_watch_handle(dev, -1); @@ -165,20 +150,21 @@ void udev_watch_end(struct udev *udev, struct udev_device *dev) struct udev_device *udev_watch_lookup(struct udev *udev, int wd) { char filename[UTIL_PATH_SIZE]; - char buf[UTIL_PATH_SIZE]; - ssize_t syslen; + char majmin[UTIL_PATH_SIZE]; + char *s; + size_t l; ssize_t len; if (inotify_fd < 0 || wd < 0) return NULL; - snprintf(filename, sizeof(filename), "%s/.udev/watch/%d", udev_get_dev_path(udev), wd); - syslen = util_strlcpy(buf, udev_get_sys_path(udev), sizeof(buf)); - len = readlink(filename, &buf[syslen], sizeof(buf)-syslen); - if (len > 0 || len < (ssize_t)(sizeof(buf)-syslen)) { - buf[syslen + len] = '\0'; - return udev_device_new_from_syspath(udev, buf); - } + snprintf(filename, sizeof(filename), "%s/watch/%d", udev_get_run_path(udev), wd); + s = majmin; + l = util_strpcpy(&s, sizeof(majmin), udev_get_sys_path(udev)); + len = readlink(filename, s, l); + if (len <= 0 || (size_t)len == l) + return NULL; + s[len] = '\0'; - return NULL; + return udev_device_new_from_id_filename(udev, s); }