X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=74572625afaae0830175bcf653e2063fc3d0b7b3;hp=971ac10809bedb81be6584cc64a16da5e6b91719;hb=5ac4a56b39fed9d95850161864befe612b1a538e;hpb=85511f02466297b7dca07c3fe5491230f3f06d14 diff --git a/udev.c b/udev.c index 971ac1080..74572625a 100644 --- a/udev.c +++ b/udev.c @@ -30,6 +30,8 @@ #include "udev.h" #include "udev_version.h" +#include "namedev.h" +#include "libsysfs/libsysfs.h" static char *get_action(void) @@ -43,173 +45,17 @@ static char *get_action(void) static char *get_device(void) { - static char device[255]; - char *temp; - - temp = getenv("DEVPATH"); - if (temp == NULL) - return NULL; - strcpy(device, SYSFS_ROOT); - strcat(device, temp); + char *device; + device = getenv("DEVPATH"); return device; } -/* - * Right now the major/minor of a device is stored in a file called - * "dev" in sysfs. - * The number is stored as: - * MMmm - * MM is the major - * mm is the minor - * The value is in hex. - * Yes, this will probably change when we go to a bigger major/minor - * range, and will have to be changed at that time. - */ -static int get_major_minor (char *dev, int *major, int *minor) -{ - char filename[255]; - char line[20]; - char temp[3]; - int fd; - int retval = 0; - - /* add the dev file to the directory and see if it's present */ - strncpy(filename, dev, sizeof(filename)); - strncat(filename, DEV_FILE, sizeof(filename)); - fd = open(filename, O_RDONLY); - if (fd < 0) { - dbg("Can't open %s", filename); - return -ENODEV; - } - - /* get the major/minor */ - retval = read(fd, line, sizeof(line)); - if (retval < 0) { - dbg("read error on %s", dev); - goto exit; - } - - temp[0] = line[0]; - temp[1] = line[1]; - temp[2] = 0x00; - *major = (int)strtol(&temp[0], NULL, 16); - - temp[0] = line[2]; - temp[1] = line[3]; - temp[2] = 0x00; - *minor = (int)strtol(&temp[0], NULL, 16); - - dbg("found major = %d, minor = %d", *major, *minor); - - retval = 0; -exit: - close(fd); - return retval; -} - -/* - * Here would go a call to the naming deamon, to get the name we want to have - * for this device. But for now, let's just default to whatever the kernel is - * calling the device as that will keep the "old-style" naming policy - */ -static char *get_name(char *dev, int major, int minor) -{ - static char name[100]; - char *temp; - - temp = strrchr(dev, '/'); - if (temp == NULL) - return NULL; - strncpy(name, &temp[1], sizeof(name)); - - dbg("name is %s", name); - - return &name[0]; -} - -/* - * Again, this will live in the naming deamon - */ -static int get_mode(char *name, char *dev, int major, int minor) -{ - /* just default everyone to rw for the world! */ - return 0666; -} - -/* - * We also want to add some permissions here, and possibly some symlinks - */ -static int create_node(char *name, char type, int major, int minor, int mode) -{ - char *argv[7]; - char mode_string[100]; - char type_string[3]; - char major_string[20]; - char minor_string[20]; - char filename[255]; - int retval = 0; - - strncpy(filename, UDEV_ROOT, sizeof(filename)); - strncat(filename, name, sizeof(filename)); - - snprintf(mode_string, sizeof(mode_string), "--mode=%#o", mode); - snprintf(type_string, sizeof(type_string), "%c", type); - snprintf(major_string, sizeof(major_string), "%d", major); - snprintf(minor_string, sizeof(minor_string), "%d", minor); - - argv[0] = MKNOD; - argv[1] = mode_string; - argv[2] = filename; - argv[3] = type_string; - argv[4] = major_string; - argv[5] = minor_string; - argv[6] = NULL; - dbg ("executing %s %s %s %s %s %s", - argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); - switch (fork()) { - case 0: - /* we are the child, so lets run the program */ - execv (MKNOD, argv); - exit(0); - break; - case (-1): - dbg ("fork failed."); - retval = -EFAULT; - break; - default: - break; - } - return retval; -} - -static int remove_node(char *name) -{ - return 0; -} - -static int do_it(char *action, char *name, char type, int major, int minor, int mode) -{ - if (strcmp(action, "add") == 0) - return create_node(name, type, major, minor, mode); - - if (strcmp(action, "remove") == 0) - return remove_node(name); - - dbg("Unknown action: %s", action); - return -EINVAL; -} - int main(int argc, char *argv[]) { - char *subsystem; char *action; char *device; - char *name; - char type; - int major; - int minor; - int mode; + char *subsystem; int retval = -EINVAL; if (argc != 2) { @@ -217,18 +63,7 @@ int main(int argc, char *argv[]) goto exit; } - /* for now, the block layer is the only place where block devices are */ subsystem = argv[1]; - if (strcmp(subsystem, "block") == 0) - type = 'b'; - else - type = 'c'; - - action = get_action(); - if (!action) { - dbg ("no action?"); - goto exit; - } device = get_device(); if (!device) { @@ -237,33 +72,37 @@ int main(int argc, char *argv[]) } dbg("looking at %s", device); - retval = get_major_minor(device, &major, &minor); - if (retval) { - dbg ("get_major_minor failed"); + /* we only care about class devices and block stuff */ + if (!strstr(device, "class") && + !strstr(device, "block")) { + dbg("not block or class"); goto exit; } - name = get_name(device, major, minor); - if (name == NULL) { - dbg ("get_name failed"); - retval = -ENODEV; + /* but we don't care about net class devices */ + if (strcmp(subsystem, "net") == 0) { + dbg("don't care about net devices"); goto exit; } - mode = get_mode(name, device, major, minor); - if (mode < 0) { - dbg ("get_mode failed"); - retval = -EINVAL; + action = get_action(); + if (!action) { + dbg ("no action?"); goto exit; } - retval = do_it(action, name, type, major, minor, mode); - if (retval) { - dbg ("do_it failed"); - goto exit; - } + /* initialize the naming deamon */ + namedev_init(); + + if (strcmp(action, "add") == 0) + return udev_add_device(device, argv[1]); + + if (strcmp(action, "remove") == 0) + return udev_remove_device(device, argv[1]); + + dbg("Unknown action: %s", action); + retval = -EINVAL; - retval = 0; exit: return retval; }