X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-watch.c;h=47dca4c6e64d62e8fb4975204a893255be3552ce;hp=2d672e211cf4eaf3e1f7f476d74352d24857981b;hb=5f59fa0900a5c127ce1a25d8ba3176f166662f96;hpb=047f88bca31f364253fe230a1c2ec7fbc43c7fc3 diff --git a/udev/udev-watch.c b/udev/udev-watch.c index 2d672e211..47dca4c6e 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,34 +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) { - int flags; - - flags = fcntl(inotify_fd, F_GETFD); - if (flags < 0) - flags = FD_CLOEXEC; - else - flags |= FD_CLOEXEC; - fcntl(inotify_fd, F_SETFD, flags); - } 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 @@ -66,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_dev_path(udev), "/.run/udev/watch.old", NULL); + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.run/udev/watch", NULL); if (rename(filename, oldname) == 0) { DIR *dir; struct dirent *ent; @@ -82,38 +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]; + 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'; - len = readlink(path, buf, sizeof(buf)); - if (len <= 0) { - unlink(path); - continue; - } - - buf[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); @@ -124,48 +102,36 @@ void udev_watch_restore(struct udev *udev) } } -static const char *udev_watch_filename(struct udev *udev, int wd) -{ - static char filename[UTIL_PATH_SIZE]; - char str[32]; - - sprintf(str, "%d", wd); - util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - util_strlcat(filename, "/.udev/watch/", sizeof(filename)); - util_strlcat(filename, str, sizeof(filename)); - - return filename; -} - void udev_watch_begin(struct udev *udev, struct udev_device *dev) { - const char *filename; + char filename[UTIL_PATH_SIZE]; int wd; - if (inotify_fd < 0 || major(udev_device_get_devnum(dev)) == 0) + if (inotify_fd < 0) return; + info(udev, "adding watch on '%s'\n", udev_device_get_devnode(dev)); wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); 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; } - filename = udev_watch_filename(udev, wd); + snprintf(filename, sizeof(filename), "%s/.run/udev/watch/%d", udev_get_dev_path(udev), wd); util_create_path(udev, filename); unlink(filename); - symlink(udev_device_get_syspath(dev), filename); + symlink(udev_device_get_id_filename(dev), filename); udev_device_set_watch_handle(dev, wd); - udev_device_update_db(dev); } void udev_watch_end(struct udev *udev, struct udev_device *dev) { int wd; - const char *filename; + char filename[UTIL_PATH_SIZE]; - if (inotify_fd < 0 || major(udev_device_get_devnum(dev)) == 0) + if (inotify_fd < 0) return; wd = udev_device_get_watch_handle(dev); @@ -175,29 +141,30 @@ 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); - filename = udev_watch_filename(udev, wd); + snprintf(filename, sizeof(filename), "%s/.run/udev/watch/%d", udev_get_dev_path(udev), wd); unlink(filename); udev_device_set_watch_handle(dev, -1); - udev_device_update_db(dev); } struct udev_device *udev_watch_lookup(struct udev *udev, int wd) { - const char *filename; - char buf[UTIL_PATH_SIZE]; + char filename[UTIL_PATH_SIZE]; + char majmin[UTIL_PATH_SIZE]; + char *s; + size_t l; ssize_t len; if (inotify_fd < 0 || wd < 0) return NULL; - filename = udev_watch_filename(udev, wd); - len = readlink(filename, buf, sizeof(buf)); - if (len > 0) { - buf[len] = '\0'; - - return udev_device_new_from_syspath(udev, buf); - } + snprintf(filename, sizeof(filename), "%s/.run/udev/watch/%d", udev_get_dev_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); }