X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=d94c9501c93a8884d2a39df006cbb8afe14b9ab6;hp=1d9b60464c32749c2a72050996dfd9a29500a7b3;hb=eb6c7cd03635ffc28798734f0b87b9e21dae6f9e;hpb=e13fa59953d64e478025fd1200bb5fd0baf671b2 diff --git a/udevstart.c b/udevstart.c index 1d9b60464..d94c9501c 100644 --- a/udevstart.c +++ b/udevstart.c @@ -23,6 +23,7 @@ */ #include +#include #include #include #include @@ -34,60 +35,99 @@ #include "logging.h" #include "udev_lib.h" +#include "list.h" +#include "udev.h" -#ifdef LOG -unsigned char logname[LOGNAME_SIZE]; -void log_message(int level, const char *format, ...) +#define MAX_PATHLEN 1024 +#define SYSBLOCK "/sys/block" +#define SYSCLASS "/sys/class" + +struct device { + struct list_head list; + char path[MAX_PATHLEN]; + char subsys[MAX_PATHLEN]; +}; + +/* sort files in lexical order */ +static int device_list_insert(char *path, char *subsystem, struct list_head *device_list) { - va_list args; + struct device *loop_device; + struct device *new_device; - va_start(args, format); - vsyslog(level, format, args); - va_end(args); -} -#endif + list_for_each_entry(loop_device, device_list, list) { + if (strcmp(loop_device->path, path) > 0) { + break; + } + } + new_device = malloc(sizeof(struct device)); + if (new_device == NULL) { + dbg("error malloc"); + return -ENOMEM; + } -#define MAX_PATHLEN 1024 -#define SYSBLOCK "/sys/block" -#define SYSCLASS "/sys/class" -#define UDEV_BIN "/sbin/udev" + strfieldcpy(new_device->path, path); + strfieldcpy(new_device->subsys, subsystem); + list_add_tail(&new_device->list, &loop_device->list); + return 0; +} static void udev_exec(const char *path, const char* subsystem) { - pid_t pid; - char action[] = "ACTION=add"; - char devpath[MAX_PATHLEN]; - char nosleep[] = "UDEV_NO_SLEEP=1"; - char *env[] = { action, devpath, nosleep, NULL }; - - strcpy(devpath, "DEVPATH="); - strfieldcat(devpath, path); - - pid = fork(); - switch (pid) { - case 0: - /* child */ - execle(UDEV_BIN, "udev", subsystem, NULL, env); - dbg("exec of child failed"); + /* Setup env variables. */ + setenv("UDEV_NO_SLEEP", "1", 1); + + /* Now call __udev_hotplug(). */ + if (__udev_hotplug("add", path, subsystem)) { + dbg("Calling of udev_hotplug failed"); exit(1); - break; - case -1: - dbg("fork of child failed"); - break; - default: - wait(NULL); } } -static void udev_scan(void) +/* list of devices that we should run last due to any one of a number of reasons */ +static char *last_list[] = { + "/block/dm", /* on here because dm wants to have the block devices around before it */ + NULL, +}; + +static void exec_list(struct list_head *device_list) +{ + struct device *loop_device; + struct device *tmp_device; + + /* handle the devices we are allowed to, excluding the "last" type devices */ + list_for_each_entry_safe(loop_device, tmp_device, device_list, list) { + int found = 0; + int i; + for (i=0; last_list[i] != NULL; i++) { + if (strncmp(loop_device->path, last_list[i], strlen(last_list[i])) == 0) { + found = 1; + break; + } + } + if (found) + continue; + + udev_exec(loop_device->path, loop_device->subsys); + list_del(&loop_device->list); + free(loop_device); + } + + /* handle the rest of the devices left over, if any */ + list_for_each_entry_safe(loop_device, tmp_device, device_list, list) { + udev_exec(loop_device->path, loop_device->subsys); + list_del(&loop_device->list); + free(loop_device); + } +} + +static void udev_scan_block(void) { - char *devpath; DIR *dir; struct dirent *dent; + LIST_HEAD(device_list); - devpath = "block"; dir = opendir(SYSBLOCK); if (dir != NULL) { for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { @@ -101,7 +141,7 @@ static void udev_scan(void) snprintf(dirname, MAX_PATHLEN, "/block/%s", dent->d_name); dirname[MAX_PATHLEN-1] = '\0'; - udev_exec(dirname, "block"); + device_list_insert(dirname, "block", &device_list); snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSBLOCK, dent->d_name); dir2 = opendir(dirname); @@ -127,7 +167,7 @@ static void udev_scan(void) snprintf(filename, MAX_PATHLEN, "/block/%s/%s", dent->d_name, dent2->d_name); filename[MAX_PATHLEN-1] = '\0'; - udev_exec(filename, "block"); + device_list_insert(filename, "block", &device_list); } } closedir(dir3); @@ -139,7 +179,15 @@ static void udev_scan(void) closedir(dir); } - devpath = "class"; + exec_list(&device_list); +} + +static void udev_scan_class(void) +{ + DIR *dir; + struct dirent *dent; + LIST_HEAD(device_list); + dir = opendir(SYSCLASS); if (dir != NULL) { for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { @@ -152,7 +200,7 @@ static void udev_scan(void) continue; snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSCLASS, dent->d_name); - dirname[MAX_PATHLEN] = '\0'; + dirname[MAX_PATHLEN-1] = '\0'; dir2 = opendir(dirname); if (dir2 != NULL) { for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { @@ -176,7 +224,7 @@ static void udev_scan(void) snprintf(filename, MAX_PATHLEN, "/class/%s/%s", dent->d_name, dent2->d_name); filename[MAX_PATHLEN-1] = '\0'; - udev_exec(filename, dent->d_name); + device_list_insert(filename, dent->d_name, &device_list); } } closedir(dir3); @@ -187,14 +235,13 @@ static void udev_scan(void) } closedir(dir); } -} + exec_list(&device_list); +} -int main(int argc, char *argv[], char *envp[]) +int udev_start(void) { - init_logging("udevstart"); - - udev_scan(); - + udev_scan_class(); + udev_scan_block(); return 0; }