udevd: clarify worker exit status

[elogind.git] / udev / udev-watch.c

diff --git a/udev/udev-watch.c b/udev/udev-watch.c
index 102e16f81d0fbfc21a7310024ac5e4e8d6461be0..0ec8bfd62793cd9796d362b27d76acc08d9f500d 100644 (file)
--- a/udev/udev-watch.c
+++ b/udev/udev-watch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2010 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2009 Canonical Ltd.
  * Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
  *
@@ -38,10 +38,8 @@ static int inotify_fd = -1;
  */
 int udev_watch_init(struct udev *udev)
 {
-       inotify_fd = inotify_init();
-       if (inotify_fd >= 0)
-               util_set_fd_cloexec(inotify_fd);
-       else
+       inotify_fd = inotify_init1(IN_CLOEXEC);
+       if (inotify_fd < 0)
                err(udev, "inotify_init failed: %m\n");
        return inotify_fd;
 }
@@ -56,8 +54,8 @@ void udev_watch_restore(struct udev *udev)
        if (inotify_fd < 0)
                return;
 
-       util_strscpyl(oldname, sizeof(oldname), udev_get_dev_path(udev), "/.udev/watch.old", NULL);
-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/watch", NULL);
+       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,28 +73,24 @@ void udev_watch_restore(struct udev *udev)
                        ssize_t len;
                        struct udev_device *dev;
 
-                       if (ent->d_name[0] < '0' || ent->d_name[0] > '9')
+                       if (ent->d_name[0] == '.')
                                continue;
 
                        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) {
-                               unlinkat(dirfd(dir), ent->d_name, 0);
-                               continue;
-                       }
+                       if (len <= 0 || len == (ssize_t)l)
+                               goto unlink;
                        s[len] = '\0';
-                       dbg(udev, "old watch to '%s' found\n", device);
-                       dev = udev_device_new_from_syspath(udev, device);
-                       if (dev == NULL) {
-                               unlinkat(dirfd(dir), ent->d_name, 0);
-                               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:
                        unlinkat(dirfd(dir), ent->d_name, 0);
                }
 
@@ -124,10 +118,10 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
                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);
 }
@@ -147,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);
@@ -156,7 +150,7 @@ 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 syspath[UTIL_PATH_SIZE];
+       char majmin[UTIL_PATH_SIZE];
        char *s;
        size_t l;
        ssize_t len;
@@ -164,12 +158,13 @@ struct udev_device *udev_watch_lookup(struct udev *udev, int wd)
        if (inotify_fd < 0 || wd < 0)
                return NULL;
 
-       snprintf(filename, sizeof(filename), "%s/.udev/watch/%d", udev_get_dev_path(udev), wd);
-       s = syspath;
-       l = util_strpcpy(&s, sizeof(syspath), udev_get_sys_path(udev));
+       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)
+       if (len <= 0 || (size_t)len == l)
                return NULL;
        s[len] = '\0';
-       return udev_device_new_from_syspath(udev, syspath);
+
+       return udev_device_new_from_id_filename(udev, s);
 }