X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=c030eb058578851682fdbf4356e7db534d5ed167;hb=eb8837e15cdb9ad8f6840406f6ef0c8cfd702b98;hp=4cdc9570935bd4d6d29de4b2ab89a1a9a4b49c97;hpb=659353f5a9a52336c41cf595d933311b8dc48937;p=elogind.git diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index 4cdc95709..c030eb058 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "libudev.h" @@ -34,47 +35,54 @@ struct udev_device { int refcount; struct udev *udev; struct udev_device *parent_device; + int parent_set; 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; + int subsystem_set; + struct udev_list_node devlinks_list; + int devlinks_uptodate; + struct udev_list_node properties_list; + char *envp[128]; + int envp_uptodate; + char *driver; + int driver_set; + dev_t devnum; char *action; int event_timeout; - char *driver; char *devpath_old; char *physdevpath; int timeout; - dev_t devnum; unsigned long long int seqnum; int num_fake_partitions; int devlink_priority; int ignore_remove; - struct list_node attr_list; + struct udev_list_node attr_list; int info_loaded; }; -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: %m\n", filename); @@ -82,7 +90,9 @@ static int device_read_db(struct udev_device *udev_device) } 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) @@ -91,8 +101,31 @@ static int device_read_db(struct udev_device *udev_device) info(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; } @@ -111,31 +144,33 @@ 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; } } @@ -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; @@ -172,7 +207,7 @@ static int device_read_uevent_file(struct udev_device *udev_device) else if (strncmp(line, "MINOR=", 6) == 0) min = strtoull(&line[6], NULL, 10); - device_add_property_from_string(udev_device, line); + udev_device_add_property_from_string(udev_device, line); } udev_device->devnum = makedev(maj, min); @@ -183,19 +218,20 @@ 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; @@ -206,9 +242,15 @@ struct udev_device *device_init(struct udev *udev) 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); + udev_list_init(&udev_device->devlinks_list); + udev_list_init(&udev_device->properties_list); + udev_list_init(&udev_device->attr_list); + udev_device->event_timeout = -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)); info(udev_device->udev, "udev_device: %p created\n", udev_device); return udev_device; } @@ -231,8 +273,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; @@ -260,6 +302,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 || @@ -281,11 +340,11 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char * } } - 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; @@ -318,21 +377,19 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de /* fallback to search sys devices for the major/minor */ if (type == 'b') - udev_enumerate_scan_devices(udev_enumerate, "block", NULL); + udev_enumerate_add_match_subsystem(udev_enumerate, "block"); else if (type == 'c') - udev_enumerate_scan_devices(udev_enumerate, "!block", NULL); + 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) { - const char *subsystem; - - subsystem = udev_device_get_subsystem(device_loop); - if (type == 'b' && strcmp(subsystem, "block") != 0) + if (type == 'b' && strcmp(udev_device_get_subsystem(device_loop), "block") != 0) continue; - if (type == 'c' && strcmp(subsystem, "block") == 0) + if (type == 'c' && strcmp(udev_device_get_subsystem(device_loop), "block") == 0) continue; device = device_loop; break; @@ -344,6 +401,94 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de 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; @@ -380,15 +525,31 @@ 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) + info(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 *parent; + + parent = udev_device_get_parent(udev_device); + while (parent != NULL) { + const char *parent_subsystem; + + parent_subsystem = udev_device_get_subsystem(parent); + if (parent_subsystem != NULL && strcmp(parent_subsystem, subsystem) == 0) + break; + parent = udev_device_get_parent(parent); + } + return parent; +} + /** * udev_device_get_udev: * @udev_device: udev device @@ -430,6 +591,8 @@ struct udev_device *udev_device_ref(struct udev_device *udev_device) **/ void udev_device_unref(struct udev_device *udev_device) { + unsigned int i; + if (udev_device == NULL) return; udev_device->refcount--; @@ -438,15 +601,18 @@ 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); + 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); + udev_list_cleanup_entries(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); free(udev_device); } @@ -490,6 +656,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 @@ -523,31 +696,30 @@ 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; - } - - /* 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; + 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 NULL; + return udev_device->subsystem; } /** @@ -569,7 +741,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); } /** @@ -590,7 +768,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) @@ -599,11 +792,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; } @@ -640,10 +833,16 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch ssize_t size; const char *val = NULL; + if (udev_device == NULL) + return NULL; + if (attr == NULL) + return NULL; + /* look for possibly already cached result */ - udev_list_entry_foreach(list_entry, list_get_entry(&udev_device->attr_list)) { + 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)); + info(udev_device->udev, "got '%s' (%s) from cache\n", + attr, udev_list_entry_get_value(list_entry)); return udev_list_entry_get_value(list_entry); } } @@ -653,7 +852,8 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch util_strlcat(path, attr, sizeof(path)); if (lstat(path, &statbuf) != 0) { - info(udev_device->udev, "stat '%s' failed: %m\n", path); + info(udev_device->udev, "no attribute '%s', keep negative entry\n", path); + udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, NULL, 0, 0); goto out; } @@ -670,7 +870,7 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch 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); + list_entry = udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, pos, 0, 0); val = udev_list_entry_get_value(list_entry); } } @@ -702,57 +902,97 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch 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); + list_entry = udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, 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_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); return 0; } -int device_add_devlink(struct udev_device *udev_device, const char *devlink) +int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink) { - if (list_entry_add(udev_device->udev, &udev_device->devlink_list, devlink, NULL, 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(struct udev_device *udev_device, const char *key, const char *value) +struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value) { - if (list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0) == NULL) - return -ENOMEM; - return 0; + 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_remove(list_entry); + return NULL; + } + return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0); } -int device_add_property_from_string(struct udev_device *udev_device, const char *property) +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; @@ -760,50 +1000,78 @@ int device_add_property_from_string(struct udev_device *udev_device, const char strncpy(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 0; + return udev_device_add_property(udev_device, name, val); +} + +char **udev_device_get_properties_envp(struct udev_device *udev_device) +{ + if (!udev_device->envp_uptodate) { + unsigned int i; + struct udev_list_entry *list_entry; + + 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; + } + return udev_device->envp; } -int device_set_action(struct udev_device *udev_device, const char *action) +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_physdevpath(struct udev_device *udev_device) { return udev_device->physdevpath; } -int device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath) +int udev_device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath) { udev_device->physdevpath = strdup(physdevpath); if (udev_device->physdevpath == NULL) @@ -811,77 +1079,87 @@ int device_set_physdevpath(struct udev_device *udev_device, const char *physdevp 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; } -