chiark / gitweb /
libudev: device - remove udev_device_get_parent_with_subsystem
[elogind.git] / udev / lib / libudev-device.c
index c76be21e8288a408484b58e70a3a3de76842043f..0cb59212815459924f7319187ff7e5b0d81e9f21 100644 (file)
@@ -32,7 +32,6 @@
 #include "libudev-private.h"
 
 struct udev_device {
-       int refcount;
        struct udev *udev;
        struct udev_device *parent_device;
        char *syspath;
@@ -41,23 +40,32 @@ struct udev_device {
        const char *sysnum;
        char *devnode;
        char *subsystem;
-       struct udev_list_node devlinks_list;
-       struct udev_list_node properties_list;
-       char *envp[128];
-       int envp_uptodate;
+       char *devtype;
        char *driver;
-       dev_t devnum;
        char *action;
-       int event_timeout;
        char *devpath_old;
        char *physdevpath;
-       int timeout;
+       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 udev_list_node attr_list;
-       int info_loaded;
+       int refcount;
+       dev_t devnum;
+       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 devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
@@ -71,7 +79,7 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
        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];
@@ -81,7 +89,7 @@ static int device_read_db(struct udev_device *udev_device)
        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: %m\n", filename);
+               dbg(udev_device->udev, "no db file to read %s: %m\n", filename);
                return -1;
        }
        if ((stats.st_mode & S_IFMT) == S_IFLNK) {
@@ -94,7 +102,7 @@ static int device_read_db(struct udev_device *udev_device)
                if (target_len > 0)
                        target[target_len] = '\0';
                else {
-                       info(udev_device->udev, "error reading db link %s: %m\n", filename);
+                       dbg(udev_device->udev, "error reading db link %s: %m\n", filename);
                        return -1;
                }
 
@@ -128,7 +136,7 @@ static int device_read_db(struct udev_device *udev_device)
 
        f = fopen(filename, "r");
        if (f == NULL) {
-               info(udev_device->udev, "error reading db file %s: %m\n", filename);
+               dbg(udev_device->udev, "error reading db file %s: %m\n", filename);
                return -1;
        }
        while (fgets(line, sizeof(line), f)) {
@@ -176,7 +184,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;
@@ -198,7 +206,9 @@ 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);
@@ -215,8 +225,8 @@ static int device_read_uevent_file(struct udev_device *udev_device)
 static void device_load_info(struct udev_device *device)
 {
        device->info_loaded = 1;
-       device_read_uevent_file(device);
-       device_read_db(device);
+       udev_device_read_uevent_file(device);
+       udev_device_read_db(device);
 }
 
 void udev_device_set_info_loaded(struct udev_device *device)
@@ -227,21 +237,26 @@ void udev_device_set_info_loaded(struct udev_device *device)
 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;
        udev_list_init(&udev_device->devlinks_list);
        udev_list_init(&udev_device->properties_list);
-       udev_list_init(&udev_device->attr_list);
+       udev_list_init(&udev_device->sysattr_list);
        udev_device->event_timeout = -1;
-       info(udev_device->udev, "udev_device: %p created\n", udev_device);
+       /* 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;
 }
 
@@ -255,7 +270,7 @@ struct udev_device *device_new(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
  **/
@@ -284,7 +299,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
        subdir = &syspath[len+1];
        pos = strrchr(subdir, '/');
        if (pos == NULL || pos < &subdir[2]) {
-               info(udev, "not a subdir :%s\n", syspath);
+               dbg(udev, "not a subdir :%s\n", syspath);
                return NULL;
        }
 
@@ -319,13 +334,13 @@ 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;
                }
        }
@@ -490,9 +505,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));
@@ -515,26 +532,35 @@ 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(struct udev_device *udev_device, const char *subsystem)
+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)
-                       break;
+               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;
@@ -576,13 +602,11 @@ 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)
 {
-       unsigned int i;
-
        if (udev_device == NULL)
                return;
        udev_device->refcount--;
@@ -594,16 +618,17 @@ void udev_device_unref(struct udev_device *udev_device)
        free(udev_device->sysname);
        free(udev_device->devnode);
        free(udev_device->subsystem);
-       udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list);
-       udev_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);
-       udev_list_cleanup(udev_device->udev, &udev_device->attr_list);
-       for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++)
-               free(udev_device->envp[i]);
-       info(udev_device->udev, "udev_device: %p released\n", udev_device);
+       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);
 }
 
@@ -686,31 +711,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;
 }
 
 /**
@@ -737,7 +781,8 @@ struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *
 
 void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
 {
-       udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list);
+       udev_device->devlinks_uptodate = 0;
+       udev_list_cleanup_entries(udev_device->udev, &udev_device->devlinks_list);
 }
 
 /**
@@ -758,6 +803,21 @@ 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);
+       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);
 }
 
@@ -767,11 +827,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;
 }
 
@@ -798,7 +858,7 @@ 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];
@@ -810,41 +870,47 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
 
        if (udev_device == NULL)
                return NULL;
-       if (attr == NULL)
+       if (sysattr == NULL)
                return NULL;
 
        /* look for possibly already cached result */
-       udev_list_entry_foreach(list_entry, udev_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: %m\n", path);
+               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 = udev_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);
                        }
                }
@@ -862,7 +928,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));
@@ -875,8 +941,8 @@ 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 = udev_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;
@@ -910,8 +976,13 @@ int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath
        }
 
        /* trailing number */
-       while (isdigit(udev_device->sysname[--len]))
+       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;
 }
 
@@ -921,14 +992,28 @@ int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsy
        udev_device->subsystem = strdup(subsystem);
        if (udev_device->subsystem == NULL)
                return -ENOMEM;
+       udev_device->subsystem_set = 1;
        udev_device_add_property(udev_device, "SUBSYSTEM", udev_device->subsystem);
        return 0;
 }
 
+int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype)
+{
+       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 udev_device_set_devnode(struct udev_device *udev_device, const char *devnode)
 {
        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);
@@ -937,24 +1022,24 @@ int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode
 
 int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink)
 {
-       char symlinks[UTIL_PATH_SIZE];
-       struct udev_list_entry *list_entry;
-
+       udev_device->devlinks_uptodate = 0;
        if (udev_list_entry_add(udev_device->udev, &udev_device->devlinks_list, devlink, NULL, 1, 0) == NULL)
                return -ENOMEM;
-       list_entry =  udev_device_get_devlinks_list_entry(udev_device);
-       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 0;
 }
 
 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);
 }
 
@@ -963,7 +1048,7 @@ struct udev_list_entry *udev_device_add_property_from_string(struct udev_device
        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 NULL;
@@ -974,36 +1059,99 @@ struct udev_list_entry *udev_device_add_property_from_string(struct udev_device
        return udev_device_add_property(udev_device, name, val);
 }
 
-char **udev_device_get_properties_envp(struct udev_device *udev_device)
+#define ENVP_SIZE                      128
+#define MONITOR_BUF_SIZE               4096
+static int update_envp_monitor_buf(struct udev_device *udev_device)
 {
-       if (!udev_device->envp_uptodate) {
-               unsigned int i;
-               struct udev_list_entry *list_entry;
+       const char *action;
+       struct udev_list_entry *list_entry;
+       size_t bufpos;
+       size_t len;
+       unsigned int i;
 
-               for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++)
-                       free(udev_device->envp[i]);
-               i = 0;
-               udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-                       asprintf(&udev_device->envp[i++], "%s=%s",
-                                udev_list_entry_get_name(list_entry),
-                                udev_list_entry_get_value(list_entry));
-                       if (i+1 >= ARRAY_SIZE(udev_device->envp))
-                               break;
-               }
-               udev_device->envp[i] = NULL;
-               info(udev_device->udev, "constructed envp from %u properties\n", i);
-               udev_device->envp_uptodate = 1;
+       /* 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;
+
+       /* header <action>@<devpath> */
+       action = udev_device_get_action(udev_device);
+       if (action == NULL)
+               return -EINVAL;
+       bufpos = util_strlcpy(udev_device->monitor_buf, action, MONITOR_BUF_SIZE);
+       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_device_get_devpath(udev_device),
+                          MONITOR_BUF_SIZE-bufpos);
+       if (len+1 >= MONITOR_BUF_SIZE-bufpos)
+               return -EINVAL;
+       bufpos += len+1;
+
+       i = 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;
+}
+
+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", action);
+       udev_device_add_property(udev_device, "ACTION", udev_device->action);
        return 0;
 }
 
@@ -1013,6 +1161,8 @@ int udev_device_set_driver(struct udev_device *udev_device, const char *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;
 }
 
@@ -1026,6 +1176,7 @@ int udev_device_set_devpath_old(struct udev_device *udev_device, const char *dev
        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;
 }
 
@@ -1067,13 +1218,24 @@ int udev_device_set_event_timeout(struct udev_device *udev_device, int event_tim
 
 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 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;
 }