chiark / gitweb /
remove all PHYSDEVPATH handling and warning about
[elogind.git] / udev / lib / libudev-device.c
index a201fb25df95c17250ec184ce44822eeff8a200a..ddc4b34115ac0848ba5db5a995ac94bcc8f16bcd 100644 (file)
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <sys/stat.h>
 
 #include "libudev.h"
 #include "libudev-private.h"
 
 struct udev_device {
-       int refcount;
        struct udev *udev;
        struct udev_device *parent_device;
        char *syspath;
        const char *devpath;
-       const char *sysname;
+       char *sysname;
+       const char *sysnum;
        char *devnode;
        char *subsystem;
-       struct list_node devlink_list;
-       struct list_node properties_list;
-       char *action;
-       int event_timeout;
+       char *devtype;
        char *driver;
+       char *action;
        char *devpath_old;
-       char *physdevpath;
-       int timeout;
-       dev_t devnum;
+       char *knodename;
+       char **envp;
+       char *monitor_buf;
+       size_t monitor_buf_len;
+       struct udev_list_node devlinks_list;
+       struct udev_list_node properties_list;
+       struct udev_list_node sysattr_list;
        unsigned long long int seqnum;
+       int event_timeout;
+       int timeout;
        int num_fake_partitions;
        int devlink_priority;
-       int ignore_remove;
-       struct list_node attr_list;
-       int info_loaded;
+       int refcount;
+       dev_t devnum;
+       int watch_handle;
+       unsigned int parent_set:1;
+       unsigned int subsystem_set:1;
+       unsigned int devtype_set:1;
+       unsigned int devlinks_uptodate:1;
+       unsigned int envp_uptodate:1;
+       unsigned int driver_set:1;
+       unsigned int info_loaded:1;
+       unsigned int ignore_remove:1;
 };
 
-static size_t syspath_to_db_path(struct udev_device *udev_device, char *filename, size_t len)
+static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
 {
        size_t start;
 
        /* translate to location of db file */
-       util_strlcpy(filename, udev_get_dev_path(udev_device->udev), len);
+       util_strlcpy(filename, udev_get_dev_path(udev), len);
        start = util_strlcat(filename, "/.udev/db/", len);
-       util_strlcat(filename, udev_device->devpath, len);
+       util_strlcat(filename, devpath, len);
        return util_path_encode(&filename[start], len - start);
 }
 
-static int device_read_db(struct udev_device *udev_device)
+int udev_device_read_db(struct udev_device *udev_device)
 {
        struct stat stats;
        char filename[UTIL_PATH_SIZE];
        char line[UTIL_LINE_SIZE];
        FILE *f;
 
-       syspath_to_db_path(udev_device, filename, sizeof(filename));
+       devpath_to_db_path(udev_device->udev, udev_device->devpath, filename, sizeof(filename));
 
        if (lstat(filename, &stats) != 0) {
-               info(udev_device->udev, "no db file to read %s: %s\n", filename, strerror(errno));
+               dbg(udev_device->udev, "no db file to read %s: %m\n", filename);
                return -1;
        }
        if ((stats.st_mode & S_IFMT) == S_IFLNK) {
                char target[UTIL_PATH_SIZE];
+               char devnode[UTIL_PATH_SIZE];
                int target_len;
+               char *next;
 
                target_len = readlink(filename, target, sizeof(target));
                if (target_len > 0)
                        target[target_len] = '\0';
                else {
-                       info(udev_device->udev, "error reading db link %s: %s\n", filename, strerror(errno));
+                       dbg(udev_device->udev, "error reading db link %s: %m\n", filename);
                        return -1;
                }
-               if (asprintf(&udev_device->devnode, "%s/%s", udev_get_dev_path(udev_device->udev), target) < 0)
-                       return -ENOMEM;
+
+               next = strchr(target, ' ');
+               if (next != NULL) {
+                       next[0] = '\0';
+                       next = &next[1];
+               }
+               util_strlcpy(devnode, udev_get_dev_path(udev_device->udev), sizeof(devnode));
+               util_strlcat(devnode, "/", sizeof(devnode));
+               util_strlcat(devnode, target, sizeof(devnode));
+               udev_device_set_devnode(udev_device, devnode);
+               while (next != NULL) {
+                       char devlink[UTIL_PATH_SIZE];
+                       const char *lnk;
+
+                       lnk = next;
+                       next = strchr(next, ' ');
+                       if (next != NULL) {
+                               next[0] = '\0';
+                               next = &next[1];
+                       }
+                       util_strlcpy(devlink, udev_get_dev_path(udev_device->udev), sizeof(devlink));
+                       util_strlcat(devlink, "/", sizeof(devlink));
+                       util_strlcat(devlink, lnk, sizeof(devlink));
+                       udev_device_add_devlink(udev_device, devlink);
+               }
                info(udev_device->udev, "device %p filled with db symlink data '%s'\n", udev_device, udev_device->devnode);
                return 0;
        }
 
        f = fopen(filename, "r");
        if (f == NULL) {
-               info(udev_device->udev, "error reading db file %s: %s\n", filename, strerror(errno));
+               dbg(udev_device->udev, "error reading db file %s: %m\n", filename);
                return -1;
        }
        while (fgets(line, sizeof(line), f)) {
@@ -111,31 +141,36 @@ static int device_read_db(struct udev_device *udev_device)
                        break;
                line[len-1] = '\0';
                val = &line[2];
-
                switch(line[0]) {
                case 'N':
-                       asprintf(&udev_device->devnode, "%s/%s", udev_get_dev_path(udev_device->udev), val);
+                       util_strlcpy(filename, udev_get_dev_path(udev_device->udev), sizeof(filename));
+                       util_strlcat(filename, "/", sizeof(filename));
+                       util_strlcat(filename, val, sizeof(filename));
+                       udev_device_set_devnode(udev_device, filename);
                        break;
                case 'S':
                        util_strlcpy(filename, udev_get_dev_path(udev_device->udev), sizeof(filename));
                        util_strlcat(filename, "/", sizeof(filename));
                        util_strlcat(filename, val, sizeof(filename));
-                       device_add_devlink(udev_device, filename);
+                       udev_device_add_devlink(udev_device, filename);
                        break;
                case 'L':
-                       device_set_devlink_priority(udev_device, atoi(val));
+                       udev_device_set_devlink_priority(udev_device, atoi(val));
                        break;
                case 'T':
-                       device_set_event_timeout(udev_device, atoi(val));
+                       udev_device_set_event_timeout(udev_device, atoi(val));
                        break;
                case 'A':
-                       device_set_num_fake_partitions(udev_device, atoi(val));
+                       udev_device_set_num_fake_partitions(udev_device, atoi(val));
                        break;
                case 'R':
-                       device_set_ignore_remove(udev_device, atoi(val));
+                       udev_device_set_ignore_remove(udev_device, atoi(val));
                        break;
                case 'E':
-                       device_add_property_from_string(udev_device, val);
+                       udev_device_add_property_from_string(udev_device, val);
+                       break;
+               case 'W':
+                       udev_device_set_watch_handle(udev_device, atoi(val));
                        break;
                }
        }
@@ -145,7 +180,7 @@ static int device_read_db(struct udev_device *udev_device)
        return 0;
 }
 
-static int device_read_uevent_file(struct udev_device *udev_device)
+int udev_device_read_uevent_file(struct udev_device *udev_device)
 {
        char filename[UTIL_PATH_SIZE];
        FILE *f;
@@ -167,12 +202,16 @@ static int device_read_uevent_file(struct udev_device *udev_device)
                        continue;
                pos[0] = '\0';
 
-               if (strncmp(line, "MAJOR=", 6) == 0)
+               if (strncmp(line, "DEVTYPE=", 8) == 0)
+                       udev_device_set_devtype(udev_device, &line[8]);
+               else if (strncmp(line, "MAJOR=", 6) == 0)
                        maj = strtoull(&line[6], NULL, 10);
                else if (strncmp(line, "MINOR=", 6) == 0)
                        min = strtoull(&line[6], NULL, 10);
+               else if (strncmp(line, "DEVNAME=", 8) == 0)
+                       udev_device_set_knodename(udev_device, &line[8]);
 
-               device_add_property_from_string(udev_device, line);
+               udev_device_add_property_from_string(udev_device, line);
        }
 
        udev_device->devnum = makedev(maj, min);
@@ -183,33 +222,40 @@ static int device_read_uevent_file(struct udev_device *udev_device)
 
 static void device_load_info(struct udev_device *device)
 {
-       device_read_uevent_file(device);
-       device_read_db(device);
        device->info_loaded = 1;
+       udev_device_read_uevent_file(device);
+       udev_device_read_db(device);
 }
 
-void device_set_info_loaded(struct udev_device *device)
+void udev_device_set_info_loaded(struct udev_device *device)
 {
        device->info_loaded = 1;
 }
 
-struct udev_device *device_init(struct udev *udev)
+struct udev_device *device_new(struct udev *udev)
 {
        struct udev_device *udev_device;
+       struct udev_list_entry *list_entry;
 
        if (udev == NULL)
                return NULL;
 
-       udev_device = malloc(sizeof(struct udev_device));
+       udev_device = calloc(1, sizeof(struct udev_device));
        if (udev_device == NULL)
                return NULL;
-       memset(udev_device, 0x00, sizeof(struct udev_device));
        udev_device->refcount = 1;
        udev_device->udev = udev;
-       list_init(&udev_device->devlink_list);
-       list_init(&udev_device->properties_list);
-       list_init(&udev_device->attr_list);
-       info(udev_device->udev, "udev_device: %p created\n", udev_device);
+       udev_list_init(&udev_device->devlinks_list);
+       udev_list_init(&udev_device->properties_list);
+       udev_list_init(&udev_device->sysattr_list);
+       udev_device->event_timeout = -1;
+       udev_device->watch_handle = -1;
+       /* copy global properties */
+       udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+               udev_device_add_property(udev_device,
+                                        udev_list_entry_get_name(list_entry),
+                                        udev_list_entry_get_value(list_entry));
+       dbg(udev_device->udev, "udev_device: %p created\n", udev_device);
        return udev_device;
 }
 
@@ -223,7 +269,7 @@ struct udev_device *device_init(struct udev *udev)
  * path to the device, including the sys mount point.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev device.
+ * release the resources of the udev device.
  *
  * Returns: a new udev device, or #NULL, if it does not exist
  **/
@@ -231,8 +277,8 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
 {
        size_t len;
        const char *subdir;
-       const char *pos;
        char path[UTIL_PATH_SIZE];
+       char *pos;
        struct stat statbuf;
        struct udev_device *udev_device;
 
@@ -251,8 +297,8 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
        /* path is not a root directory */
        subdir = &syspath[len+1];
        pos = strrchr(subdir, '/');
-       if (pos == NULL || pos < &subdir[2]) {
-               info(udev, "not in subdir :%s\n", syspath);
+       if (pos == NULL || pos[1] == '\0' || pos < &subdir[2]) {
+               dbg(udev, "not a subdir :%s\n", syspath);
                return NULL;
        }
 
@@ -260,6 +306,23 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
        util_strlcpy(path, syspath, sizeof(path));
        util_resolve_sys_link(udev, path, sizeof(path));
 
+       /* try to resolve the silly block layout if needed */
+       if (strncmp(&path[len], "/block/", 7) == 0) {
+               char block[UTIL_PATH_SIZE];
+               char part[UTIL_PATH_SIZE];
+
+               util_strlcpy(block, path, sizeof(block));
+               pos = strrchr(block, '/');
+               if (pos == NULL)
+                       return NULL;
+               util_strlcpy(part, pos, sizeof(part));
+               pos[0] = '\0';
+               if (util_resolve_sys_link(udev, block, sizeof(block)) == 0) {
+                       util_strlcpy(path, block, sizeof(path));
+                       util_strlcat(path, part, sizeof(path));
+               }
+       }
+
        /* path exists in sys */
        if (strncmp(&syspath[len], "/devices/", 9) == 0 ||
            strncmp(&syspath[len], "/class/", 7) == 0 ||
@@ -270,22 +333,22 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
                util_strlcpy(file, path, sizeof(file));
                util_strlcat(file, "/uevent", sizeof(file));
                if (stat(file, &statbuf) != 0) {
-                       info(udev, "not a device: %s\n", syspath);
+                       dbg(udev, "not a device: %s\n", syspath);
                        return NULL;
                }
        } else {
                /* everything else just needs to be a directory */
                if (stat(path, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode)) {
-                       info(udev, "directory not found: %s\n", syspath);
+                       dbg(udev, "directory not found: %s\n", syspath);
                        return NULL;
                }
        }
 
-       udev_device = device_init(udev);
+       udev_device = device_new(udev);
        if (udev_device == NULL)
                return NULL;
 
-       device_set_syspath(udev_device, path);
+       udev_device_set_syspath(udev_device, path);
        info(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
 
        return udev_device;
@@ -295,7 +358,7 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de
 {
        char path[UTIL_PATH_SIZE];
        const char *type_str;
-       struct udev_enumerate *enumerate;
+       struct udev_enumerate *udev_enumerate;
        struct udev_list_entry *list_entry;
        struct udev_device *device = NULL;
 
@@ -312,26 +375,124 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de
        if (util_resolve_sys_link(udev, path, sizeof(path)) == 0)
                return udev_device_new_from_syspath(udev, path);
 
-       /* fallback to search all sys devices for the major/minor */
-       enumerate = udev_enumerate_new_from_subsystems(udev, NULL);
-       if (enumerate == NULL)
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
                return NULL;
-       udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+
+       /* fallback to search sys devices for the major/minor */
+       if (type == 'b')
+               udev_enumerate_add_match_subsystem(udev_enumerate, "block");
+       else if (type == 'c')
+               udev_enumerate_add_nomatch_subsystem(udev_enumerate, "block");
+       udev_enumerate_scan_devices(udev_enumerate);
+       udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) {
                struct udev_device *device_loop;
 
                device_loop = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
                if (device_loop != NULL) {
                        if (udev_device_get_devnum(device_loop) == devnum) {
+                               if (type == 'b' && strcmp(udev_device_get_subsystem(device_loop), "block") != 0)
+                                       continue;
+                               if (type == 'c' && strcmp(udev_device_get_subsystem(device_loop), "block") == 0)
+                                       continue;
                                device = device_loop;
                                break;
                        }
                        udev_device_unref(device_loop);
                }
        }
-       udev_enumerate_unref(enumerate);
+       udev_enumerate_unref(udev_enumerate);
        return device;
 }
 
+struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname)
+{
+       size_t sys_path_len;
+       char path_full[UTIL_PATH_SIZE];
+       char *path;
+       struct stat statbuf;
+
+       sys_path_len = util_strlcpy(path_full, udev_get_sys_path(udev), sizeof(path_full));
+       path = &path_full[sys_path_len];
+
+       if (strcmp(subsystem, "subsystem") == 0) {
+               util_strlcpy(path, "/subsystem/", sizeof(path_full) - sys_path_len);
+               util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+               if (stat(path_full, &statbuf) == 0)
+                       goto found;
+
+               util_strlcpy(path, "/bus/", sizeof(path_full) - sys_path_len);
+               util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+               if (stat(path_full, &statbuf) == 0)
+                       goto found;
+
+               util_strlcpy(path, "/class/", sizeof(path_full) - sys_path_len);
+               util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+               if (stat(path_full, &statbuf) == 0)
+                       goto found;
+               goto out;
+       }
+
+       if (strcmp(subsystem, "module") == 0) {
+               util_strlcpy(path, "/module/", sizeof(path_full) - sys_path_len);
+               util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+               if (stat(path_full, &statbuf) == 0)
+                       goto found;
+               goto out;
+       }
+
+       if (strcmp(subsystem, "drivers") == 0) {
+               char subsys[UTIL_NAME_SIZE];
+               char *driver;
+
+               util_strlcpy(subsys, sysname, sizeof(subsys));
+               driver = strchr(subsys, ':');
+               if (driver != NULL) {
+                       driver[0] = '\0';
+                       driver = &driver[1];
+                       util_strlcpy(path, "/subsystem/", sizeof(path_full) - sys_path_len);
+                       util_strlcat(path, subsys, sizeof(path_full) - sys_path_len);
+                       util_strlcat(path, "/drivers/", sizeof(path_full) - sys_path_len);
+                       util_strlcat(path, driver, sizeof(path_full) - sys_path_len);
+                       if (stat(path_full, &statbuf) == 0)
+                               goto found;
+
+                       util_strlcpy(path, "/bus/", sizeof(path_full) - sys_path_len);
+                       util_strlcat(path, subsys, sizeof(path_full) - sys_path_len);
+                       util_strlcat(path, "/drivers/", sizeof(path_full) - sys_path_len);
+                       util_strlcat(path, driver, sizeof(path_full) - sys_path_len);
+                       if (stat(path_full, &statbuf) == 0)
+                               goto found;
+               }
+               goto out;
+       }
+
+       util_strlcpy(path, "/subsystem/", sizeof(path_full) - sys_path_len);
+       util_strlcat(path, subsystem, sizeof(path_full) - sys_path_len);
+       util_strlcat(path, "/devices/", sizeof(path_full) - sys_path_len);
+       util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+       if (stat(path_full, &statbuf) == 0)
+               goto found;
+
+       util_strlcpy(path, "/bus/", sizeof(path_full) - sys_path_len);
+       util_strlcat(path, subsystem, sizeof(path_full) - sys_path_len);
+       util_strlcat(path, "/devices/", sizeof(path_full) - sys_path_len);
+       util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+       if (stat(path_full, &statbuf) == 0)
+               goto found;
+
+       util_strlcpy(path, "/class/", sizeof(path_full) - sys_path_len);
+       util_strlcat(path, subsystem, sizeof(path_full) - sys_path_len);
+       util_strlcat(path, "/", sizeof(path_full) - sys_path_len);
+       util_strlcat(path, sysname, sizeof(path_full) - sys_path_len);
+       if (stat(path_full, &statbuf) == 0)
+               goto found;
+out:
+       return NULL;
+found:
+       return udev_device_new_from_syspath(udev, path_full);
+}
+
 static struct udev_device *device_new_from_parent(struct udev_device *udev_device)
 {
        struct udev_device *udev_device_parent = NULL;
@@ -343,9 +504,11 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
            strncmp(udev_device->devpath, "/block/", 7) == 0) {
                util_strlcpy(path, udev_device->syspath, sizeof(path));
                util_strlcat(path, "/device", sizeof(path));
-               if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0)
+               if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0) {
                        udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path);
-               return udev_device_parent;
+                       if (udev_device_parent != NULL)
+                               return udev_device_parent;
+               }
        }
 
        util_strlcpy(path, udev_device->syspath, sizeof(path));
@@ -368,15 +531,40 @@ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
 {
        if (udev_device == NULL)
                return NULL;
-
-       if (udev_device->parent_device != NULL) {
-               info(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
-               return udev_device->parent_device;
+       if (!udev_device->parent_set) {
+               udev_device->parent_set = 1;
+               udev_device->parent_device = device_new_from_parent(udev_device);
        }
-       udev_device->parent_device = device_new_from_parent(udev_device);
+       if (udev_device->parent_device != NULL)
+               dbg(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
        return udev_device->parent_device;
 }
 
+struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype)
+{
+       struct udev_device *parent;
+
+       if (subsystem == NULL)
+               return NULL;
+
+       parent = udev_device_get_parent(udev_device);
+       while (parent != NULL) {
+               const char *parent_subsystem;
+               const char *parent_devtype;
+
+               parent_subsystem = udev_device_get_subsystem(parent);
+               if (parent_subsystem != NULL && strcmp(parent_subsystem, subsystem) == 0) {
+                       if (devtype == NULL)
+                               break;
+                       parent_devtype = udev_device_get_devtype(parent);
+                       if (parent_devtype != NULL && strcmp(parent_devtype, devtype) == 0)
+                               break;
+               }
+               parent = udev_device_get_parent(parent);
+       }
+       return parent;
+}
+
 /**
  * udev_device_get_udev:
  * @udev_device: udev device
@@ -413,7 +601,7 @@ struct udev_device *udev_device_ref(struct udev_device *udev_device)
  * @udev_device: udev device
  *
  * Drop a reference of a udev device. If the refcount reaches zero,
- * the ressources of the device will be released.
+ * the resources of the device will be released.
  *
  **/
 void udev_device_unref(struct udev_device *udev_device)
@@ -426,16 +614,20 @@ void udev_device_unref(struct udev_device *udev_device)
        if (udev_device->parent_device != NULL)
                udev_device_unref(udev_device->parent_device);
        free(udev_device->syspath);
+       free(udev_device->sysname);
        free(udev_device->devnode);
        free(udev_device->subsystem);
-       list_cleanup(udev_device->udev, &udev_device->devlink_list);
-       list_cleanup(udev_device->udev, &udev_device->properties_list);
+       free(udev_device->devtype);
+       udev_list_cleanup_entries(udev_device->udev, &udev_device->devlinks_list);
+       udev_list_cleanup_entries(udev_device->udev, &udev_device->properties_list);
        free(udev_device->action);
        free(udev_device->driver);
        free(udev_device->devpath_old);
-       free(udev_device->physdevpath);
-       list_cleanup(udev_device->udev, &udev_device->attr_list);
-       info(udev_device->udev, "udev_device: %p released\n", udev_device);
+       free(udev_device->knodename);
+       udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
+       free(udev_device->envp);
+       free(udev_device->monitor_buf);
+       dbg(udev_device->udev, "udev_device: %p released\n", udev_device);
        free(udev_device);
 }
 
@@ -478,6 +670,13 @@ const char *udev_device_get_sysname(struct udev_device *udev_device)
        return udev_device->sysname;
 }
 
+const char *udev_device_get_sysnum(struct udev_device *udev_device)
+{
+       if (udev_device == NULL)
+               return NULL;
+       return udev_device->sysnum;
+}
+
 /**
  * udev_device_get_devnode:
  * @udev_device: udev device
@@ -511,31 +710,50 @@ const char *udev_device_get_subsystem(struct udev_device *udev_device)
 
        if (udev_device == NULL)
                return NULL;
-       if (udev_device->subsystem != NULL)
-               return udev_device->subsystem;
-
-       /* read "subsytem" link */
-       if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
-               udev_device->subsystem = strdup(subsystem);
-               return udev_device->subsystem;
+       if (!udev_device->subsystem_set) {
+               udev_device->subsystem_set = 1;
+               /* read "subsytem" link */
+               if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
+                       udev_device_set_subsystem(udev_device, subsystem);
+                       return udev_device->subsystem;
+               }
+               /* implicit names */
+               if (strncmp(udev_device->devpath, "/module/", 8) == 0) {
+                       udev_device_set_subsystem(udev_device, "module");
+                       return udev_device->subsystem;
+               }
+               if (strstr(udev_device->devpath, "/drivers/") != NULL) {
+                       udev_device_set_subsystem(udev_device, "drivers");
+                       return udev_device->subsystem;
+               }
+               if (strncmp(udev_device->devpath, "/subsystem/", 11) == 0 ||
+                   strncmp(udev_device->devpath, "/class/", 7) == 0 ||
+                   strncmp(udev_device->devpath, "/bus/", 5) == 0) {
+                       udev_device_set_subsystem(udev_device, "subsystem");
+                       return udev_device->subsystem;
+               }
        }
+       return udev_device->subsystem;
+}
 
-       /* implicit names */
-       if (strncmp(udev_device->devpath, "/module/", 8) == 0) {
-               udev_device->subsystem = strdup("module");
-               return udev_device->subsystem;
-       }
-       if (strstr(udev_device->devpath, "/drivers/") != NULL) {
-               udev_device->subsystem = strdup("drivers");
-               return udev_device->subsystem;
-       }
-       if (strncmp(udev_device->devpath, "/subsystem/", 11) == 0 ||
-           strncmp(udev_device->devpath, "/class/", 7) == 0 ||
-           strncmp(udev_device->devpath, "/bus/", 5) == 0) {
-               udev_device->subsystem = strdup("subsystem");
-               return udev_device->subsystem;
+/**
+ * udev_device_get_devtype:
+ * @udev_device: udev device
+ *
+ * Retrieve the devtype string of the udev device.
+ *
+ * Returns: the devtype name of the udev device, or #NULL if it can not be determined
+ **/
+const char *udev_device_get_devtype(struct udev_device *udev_device)
+{
+       if (udev_device == NULL)
+               return NULL;
+       if (!udev_device->devtype_set) {
+               udev_device->devtype_set = 1;
+               if (!udev_device->info_loaded)
+                       udev_device_read_uevent_file(udev_device);
        }
-       return NULL;
+       return udev_device->devtype;
 }
 
 /**
@@ -557,7 +775,13 @@ struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *
                return NULL;
        if (!udev_device->info_loaded)
                device_load_info(udev_device);
-       return list_get_entry(&udev_device->devlink_list);
+       return udev_list_get_entry(&udev_device->devlinks_list);
+}
+
+void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
+{
+       udev_device->devlinks_uptodate = 0;
+       udev_list_cleanup_entries(udev_device->udev, &udev_device->devlinks_list);
 }
 
 /**
@@ -578,7 +802,22 @@ struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device
                return NULL;
        if (!udev_device->info_loaded)
                device_load_info(udev_device);
-       return list_get_entry(&udev_device->properties_list);
+       if (!udev_device->devlinks_uptodate) {
+               char symlinks[UTIL_PATH_SIZE];
+               struct udev_list_entry *list_entry;
+
+               udev_device->devlinks_uptodate = 1;
+               list_entry = udev_device_get_devlinks_list_entry(udev_device);
+               if (list_entry != NULL) {
+                       util_strlcpy(symlinks, udev_list_entry_get_name(list_entry), sizeof(symlinks));
+                       udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
+                               util_strlcat(symlinks, " ", sizeof(symlinks));
+                               util_strlcat(symlinks, udev_list_entry_get_name(list_entry), sizeof(symlinks));
+                       }
+                       udev_device_add_property(udev_device, "DEVLINKS", symlinks);
+               }
+       }
+       return udev_list_get_entry(&udev_device->properties_list);
 }
 
 const char *udev_device_get_driver(struct udev_device *udev_device)
@@ -587,11 +826,11 @@ const char *udev_device_get_driver(struct udev_device *udev_device)
 
        if (udev_device == NULL)
                return NULL;
-       if (udev_device->driver != NULL)
-               return udev_device->driver;
-       if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) < 2)
-               return NULL;
-       udev_device->driver = strdup(driver);
+       if (!udev_device->driver_set) {
+               udev_device->driver_set = 1;
+               if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) > 0)
+                       udev_device->driver = strdup(driver);
+       }
        return udev_device->driver;
 }
 
@@ -618,47 +857,59 @@ unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device)
        return udev_device->seqnum;
 }
 
-const char *udev_device_get_attr_value(struct udev_device *udev_device, const char *attr)
+const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr)
 {
        struct udev_list_entry *list_entry;
        char path[UTIL_PATH_SIZE];
-       char value[UTIL_NAME_SIZE];
+       char value[4096];
        struct stat statbuf;
        int fd;
        ssize_t size;
        const char *val = NULL;
 
+       if (udev_device == NULL)
+               return NULL;
+       if (sysattr == NULL)
+               return NULL;
+
        /* look for possibly already cached result */
-       udev_list_entry_foreach(list_entry, list_get_entry(&udev_device->attr_list)) {
-               if (strcmp(udev_list_entry_get_name(list_entry), attr) == 0) {
-                       info(udev_device->udev, "got '%s' (%s) from cache\n", attr, udev_list_entry_get_value(list_entry));
+       udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->sysattr_list)) {
+               if (strcmp(udev_list_entry_get_name(list_entry), sysattr) == 0) {
+                       dbg(udev_device->udev, "got '%s' (%s) from cache\n",
+                           sysattr, udev_list_entry_get_value(list_entry));
                        return udev_list_entry_get_value(list_entry);
                }
        }
 
        util_strlcpy(path, udev_device_get_syspath(udev_device), sizeof(path));
        util_strlcat(path, "/", sizeof(path));
-       util_strlcat(path, attr, sizeof(path));
+       util_strlcat(path, sysattr, sizeof(path));
 
        if (lstat(path, &statbuf) != 0) {
-               info(udev_device->udev, "stat '%s' failed: %s\n", path, strerror(errno));
+               dbg(udev_device->udev, "no attribute '%s', keep negative entry\n", path);
+               udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, NULL, 0, 0);
                goto out;
        }
 
        if (S_ISLNK(statbuf.st_mode)) {
-               /* links return the last element of the target path */
                char target[UTIL_NAME_SIZE];
                int len;
                char *pos;
 
+               /* some core links return the last element of the target path */
+               if (strcmp(sysattr, "driver") != 0 &&
+                   strcmp(sysattr, "subsystem") != 0 &&
+                   strcmp(sysattr, "module") != 0)
+                       goto out;
+
                len = readlink(path, target, sizeof(target));
                if (len > 0) {
                        target[len] = '\0';
                        pos = strrchr(target, '/');
                        if (pos != NULL) {
                                pos = &pos[1];
-                               info(udev_device->udev, "cache '%s' with link value '%s'\n", attr, pos);
-                               list_entry = list_entry_add(udev_device->udev, &udev_device->attr_list, attr, pos, 0, 0);
+                               dbg(udev_device->udev, "cache '%s' with link value '%s'\n", sysattr, pos);
+                               list_entry = udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, pos, 0, 0);
                                val = udev_list_entry_get_value(list_entry);
                        }
                }
@@ -676,7 +927,7 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
        /* read attribute value */
        fd = open(path, O_RDONLY);
        if (fd < 0) {
-               info(udev_device->udev, "attribute '%s' can not be opened\n", path);
+               dbg(udev_device->udev, "attribute '%s' can not be opened\n", path);
                goto out;
        }
        size = read(fd, value, sizeof(value));
@@ -689,187 +940,350 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
        /* got a valid value, store it in cache and return it */
        value[size] = '\0';
        util_remove_trailing_chars(value, '\n');
-       info(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
-       list_entry = list_entry_add(udev_device->udev, &udev_device->attr_list, attr, value, 0, 0);
+       dbg(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
+       list_entry = udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, value, 0, 0);
        val = udev_list_entry_get_value(list_entry);
 out:
        return val;
 }
-int device_set_syspath(struct udev_device *udev_device, const char *syspath)
+
+int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath)
 {
        const char *pos;
+       size_t len;
 
+       free(udev_device->syspath);
        udev_device->syspath = strdup(syspath);
        if (udev_device->syspath ==  NULL)
                return -ENOMEM;
        udev_device->devpath = &udev_device->syspath[strlen(udev_get_sys_path(udev_device->udev))];
+       udev_device_add_property(udev_device, "DEVPATH", udev_device->devpath);
+
        pos = strrchr(udev_device->syspath, '/');
        if (pos == NULL)
                return -EINVAL;
-       udev_device->sysname = &pos[1];
+       udev_device->sysname = strdup(&pos[1]);
+       if (udev_device->sysname == NULL)
+               return -ENOMEM;
+
+       /* some devices have '!' in their name, change that to '/' */
+       len = 0;
+       while (udev_device->sysname[len] != '\0') {
+               if (udev_device->sysname[len] == '!')
+                       udev_device->sysname[len] = '/';
+               len++;
+       }
+
+       /* trailing number */
+       while (len > 0 && isdigit(udev_device->sysname[--len]))
+               udev_device->sysnum = &udev_device->sysname[len];
+
+       /* sysname is completely numeric */
+       if (len == 0)
+               udev_device->sysnum = NULL;
+
        return 0;
 }
 
-int device_set_subsystem(struct udev_device *udev_device, const char *subsystem)
+int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem)
 {
+       free(udev_device->subsystem);
        udev_device->subsystem = strdup(subsystem);
        if (udev_device->subsystem == NULL)
-               return -1;
+               return -ENOMEM;
+       udev_device->subsystem_set = 1;
+       udev_device_add_property(udev_device, "SUBSYSTEM", udev_device->subsystem);
        return 0;
 }
 
-int device_set_devnode(struct udev_device *udev_device, const char *devnode)
+int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype)
 {
-       udev_device->devnode = strdup(devnode);
-       if (udev_device->devnode == NULL)
+       free(udev_device->devtype);
+       udev_device->devtype = strdup(devtype);
+       if (udev_device->devtype == NULL)
                return -ENOMEM;
+       udev_device->devtype_set = 1;
+       udev_device_add_property(udev_device, "DEVTYPE", udev_device->devtype);
        return 0;
 }
 
-int device_add_devlink(struct udev_device *udev_device, const char *devlink)
+int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode)
 {
-       if (list_entry_add(udev_device->udev, &udev_device->devlink_list, devlink, NULL, 1, 0) == NULL)
+       free(udev_device->devnode);
+       udev_device->devnode = strdup(devnode);
+       if (devnode == NULL)
+               return 0;
+       if (udev_device->devnode == NULL)
                return -ENOMEM;
+       udev_device_add_property(udev_device, "DEVNAME", udev_device->devnode);
        return 0;
 }
 
-int device_add_property(struct udev_device *udev_device, const char *key, const char *value)
+int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink)
 {
-       if (list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0) == NULL)
+       udev_device->devlinks_uptodate = 0;
+       if (udev_list_entry_add(udev_device->udev, &udev_device->devlinks_list, devlink, NULL, 1, 0) == NULL)
                return -ENOMEM;
        return 0;
 }
 
-int device_add_property_from_string(struct udev_device *udev_device, const char *property)
+struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
+{
+       udev_device->envp_uptodate = 0;
+       if (value == NULL) {
+               struct udev_list_entry *list_entry;
+
+               list_entry = udev_device_get_properties_list_entry(udev_device);
+               list_entry = udev_list_entry_get_by_name(list_entry, key);
+               if (list_entry != NULL)
+                       udev_list_entry_delete(list_entry);
+               return NULL;
+       }
+       return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);
+}
+
+struct udev_list_entry *udev_device_add_property_from_string(struct udev_device *udev_device, const char *property)
 {
        char name[UTIL_PATH_SIZE];
        char *val;
 
-       strncpy(name, property, sizeof(name));
+       util_strlcpy(name, property, sizeof(name));
        val = strchr(name, '=');
        if (val == NULL)
-               return -1;
+               return NULL;
        val[0] = '\0';
        val = &val[1];
        if (val[0] == '\0')
                val = NULL;
-       device_add_property(udev_device, name, val);
+       return udev_device_add_property(udev_device, name, val);
+}
+
+const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key)
+{
+       struct udev_list_entry *list_entry;
+
+       if (udev_device == NULL)
+               return NULL;
+       if (key == NULL)
+               return NULL;
+
+       list_entry = udev_device_get_properties_list_entry(udev_device);
+       list_entry =  udev_list_entry_get_by_name(list_entry, key);
+       return udev_list_entry_get_value(list_entry);
+}
+
+#define ENVP_SIZE                      128
+#define MONITOR_BUF_SIZE               4096
+static int update_envp_monitor_buf(struct udev_device *udev_device)
+{
+       struct udev_list_entry *list_entry;
+       size_t bufpos;
+       size_t len;
+       unsigned int i;
+
+       /* monitor buffer of property strings */
+       free(udev_device->monitor_buf);
+       udev_device->monitor_buf_len = 0;
+       udev_device->monitor_buf = malloc(MONITOR_BUF_SIZE);
+       if (udev_device->monitor_buf == NULL)
+               return -ENOMEM;
+
+       /* envp array, strings will point into monitor buffer */
+       if (udev_device->envp == NULL)
+               udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE);
+       if (udev_device->envp == NULL)
+               return -ENOMEM;
+
+       i = 0;
+       bufpos = 0;
+       udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
+               /* add string to envp array */
+               udev_device->envp[i++] = &udev_device->monitor_buf[bufpos];
+               if (i+1 >= ENVP_SIZE)
+                       return -EINVAL;
+
+               /* add property string to monitor buffer */
+               len = util_strlcpy(&udev_device->monitor_buf[bufpos],
+                                  udev_list_entry_get_name(list_entry), MONITOR_BUF_SIZE-bufpos);
+               if (len >= MONITOR_BUF_SIZE-bufpos)
+                       return -EINVAL;
+               bufpos += len;
+               len = util_strlcpy(&udev_device->monitor_buf[bufpos], "=", MONITOR_BUF_SIZE-bufpos);
+               if (len >= MONITOR_BUF_SIZE-bufpos)
+                       return -EINVAL;
+               bufpos += len;
+               len = util_strlcpy(&udev_device->monitor_buf[bufpos], udev_list_entry_get_value(list_entry),
+                                  MONITOR_BUF_SIZE-bufpos);
+               if (len+1 >= MONITOR_BUF_SIZE-bufpos)
+                       return -EINVAL;
+               bufpos += len+1;
+       }
+       udev_device->envp[i] = NULL;
+       udev_device->monitor_buf_len = bufpos;
+       udev_device->envp_uptodate = 1;
+       dbg(udev_device->udev, "filled envp/monitor buffer, %u properties, %zu bytes\n", i, bufpos);
        return 0;
 }
 
-int device_set_action(struct udev_device *udev_device, const char *action)
+char **udev_device_get_properties_envp(struct udev_device *udev_device)
+{
+       if (!udev_device->envp_uptodate)
+               if (update_envp_monitor_buf(udev_device) != 0)
+                       return NULL;
+       return udev_device->envp;
+}
+
+ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf)
 {
+       if (!udev_device->envp_uptodate)
+               if (update_envp_monitor_buf(udev_device) != 0)
+                       return -EINVAL;
+       *buf = udev_device->monitor_buf;
+       return udev_device->monitor_buf_len;
+}
+
+int udev_device_set_action(struct udev_device *udev_device, const char *action)
+{
+       free(udev_device->action);
        udev_device->action = strdup(action);
        if (udev_device->action == NULL)
                return -ENOMEM;
+       udev_device_add_property(udev_device, "ACTION", udev_device->action);
        return 0;
 }
 
-int device_set_driver(struct udev_device *udev_device, const char *driver)
+int udev_device_set_driver(struct udev_device *udev_device, const char *driver)
 {
+       free(udev_device->driver);
        udev_device->driver = strdup(driver);
        if (udev_device->driver == NULL)
                return -ENOMEM;
+       udev_device->driver_set = 1;
+       udev_device_add_property(udev_device, "DRIVER", udev_device->driver);
        return 0;
 }
 
-const char *device_get_devpath_old(struct udev_device *udev_device)
+const char *udev_device_get_devpath_old(struct udev_device *udev_device)
 {
        return udev_device->devpath_old;
 }
 
-int device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old)
+int udev_device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old)
 {
        udev_device->devpath_old = strdup(devpath_old);
        if (udev_device->devpath_old == NULL)
                return -ENOMEM;
+       udev_device_add_property(udev_device, "DEVPATH_OLD", udev_device->devpath_old);
        return 0;
 }
 
-const char *device_get_physdevpath(struct udev_device *udev_device)
+const char *udev_device_get_knodename(struct udev_device *udev_device)
 {
-       return udev_device->physdevpath;
+       return udev_device->knodename;
 }
 
-int device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath)
+int udev_device_set_knodename(struct udev_device *udev_device, const char *knodename)
 {
-       udev_device->physdevpath = strdup(physdevpath);
-       if (udev_device->physdevpath == NULL)
+       udev_device->knodename = strdup(knodename);
+       if (udev_device->knodename == NULL)
                return -ENOMEM;
        return 0;
 }
 
-int device_get_timeout(struct udev_device *udev_device)
+int udev_device_get_timeout(struct udev_device *udev_device)
 {
        return udev_device->timeout;
 }
 
-int device_set_timeout(struct udev_device *udev_device, int timeout)
+int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
 {
        udev_device->timeout = timeout;
        return 0;
 }
-int device_get_event_timeout(struct udev_device *udev_device)
+int udev_device_get_event_timeout(struct udev_device *udev_device)
 {
        if (!udev_device->info_loaded)
                device_load_info(udev_device);
        return udev_device->event_timeout;
 }
 
-int device_set_event_timeout(struct udev_device *udev_device, int event_timeout)
+int udev_device_set_event_timeout(struct udev_device *udev_device, int event_timeout)
 {
        udev_device->event_timeout = event_timeout;
        return 0;
 }
 
-int device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum)
+int udev_device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum)
 {
+       char num[32];
+
        udev_device->seqnum = seqnum;
+       snprintf(num, sizeof(num), "%llu", seqnum);
+       udev_device_add_property(udev_device, "SEQNUM", num);
        return 0;
 }
 
-int device_set_devnum(struct udev_device *udev_device, dev_t devnum)
+int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
 {
+       char num[32];
+
        udev_device->devnum = devnum;
+
+       snprintf(num, sizeof(num), "%u", major(devnum));
+       udev_device_add_property(udev_device, "MAJOR", num);
+       snprintf(num, sizeof(num), "%u", minor(devnum));
+       udev_device_add_property(udev_device, "MINOR", num);
        return 0;
 }
 
-int device_get_num_fake_partitions(struct udev_device *udev_device)
+int udev_device_get_num_fake_partitions(struct udev_device *udev_device)
 {
        if (!udev_device->info_loaded)
                device_load_info(udev_device);
        return udev_device->num_fake_partitions;
 }
 
-int device_set_num_fake_partitions(struct udev_device *udev_device, int num)
+int udev_device_set_num_fake_partitions(struct udev_device *udev_device, int num)
 {
        udev_device->num_fake_partitions = num;
        return 0;
 }
 
-int device_get_devlink_priority(struct udev_device *udev_device)
+int udev_device_get_devlink_priority(struct udev_device *udev_device)
 {
        if (!udev_device->info_loaded)
                device_load_info(udev_device);
        return udev_device->devlink_priority;
 }
 
-int device_set_devlink_priority(struct udev_device *udev_device, int prio)
+int udev_device_set_devlink_priority(struct udev_device *udev_device, int prio)
 {
         udev_device->devlink_priority = prio;
        return 0;
 }
 
-int device_get_ignore_remove(struct udev_device *udev_device)
+int udev_device_get_ignore_remove(struct udev_device *udev_device)
 {
        if (!udev_device->info_loaded)
                device_load_info(udev_device);
        return udev_device->ignore_remove;
 }
 
-int device_set_ignore_remove(struct udev_device *udev_device, int ignore)
+int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore)
 {
        udev_device->ignore_remove = ignore;
        return 0;
 }
 
+int udev_device_get_watch_handle(struct udev_device *udev_device)
+{
+       if (!udev_device->info_loaded)
+               device_load_info(udev_device);
+       return udev_device->watch_handle;
+}
+
+int udev_device_set_watch_handle(struct udev_device *udev_device, int handle)
+{
+       udev_device->watch_handle = handle;
+       return 0;
+}