X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=6e7ac25175b8dc9450b9426cda9a266f538c2288;hp=bf170d1651d55c69c253d72144f8bb9b07d99bb8;hb=dbfc520c605dee3244dbbfd563e908901324689b;hpb=2232cac825e4f8b53273d16154309278cf639e3c diff --git a/udev.c b/udev.c index bf170d165..6e7ac2517 100644 --- a/udev.c +++ b/udev.c @@ -31,6 +31,8 @@ #include "udev.h" #include "udev_version.h" #include "namedev.h" +#include "udevdb.h" +#include "libsysfs/libsysfs.h" static char *get_action(void) @@ -44,262 +46,74 @@ 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; -} - -/* - * We also want to clean up any symlinks that were created in create_node() - */ -static int delete_node(char *name) -{ - char filename[255]; - - strncpy(filename, UDEV_ROOT, sizeof(filename)); - strncat(filename, name, sizeof(filename)); - - dbg("unlinking %s", filename); - return unlink(filename); -} - -static int add_device(char *device, char type) +int main(int argc, char *argv[]) { - char *name; - int major; - int minor; - int mode; + char *action; + char *device; + char *subsystem; int retval = -EINVAL; - - retval = get_major_minor(device, &major, &minor); - if (retval) { - dbg ("get_major_minor failed"); + + if (argc != 2) { + dbg ("unknown number of arguments"); goto exit; } - name = get_name(device, major, minor); - if (name == NULL) { - dbg ("get_name failed"); - retval = -ENODEV; - goto exit; - } + subsystem = argv[1]; - mode = get_mode(name, device, major, minor); - if (mode < 0) { - dbg ("get_mode failed"); - retval = -EINVAL; + device = get_device(); + if (!device) { + dbg ("no device?"); goto exit; } + dbg("looking at %s", device); - return create_node(name, type, major, minor, mode); - -exit: - return retval; -} - -static int remove_device(char *device) -{ - char *name; - int retval = 0; - - name = get_name(device, 0, 0); - if (name == NULL) { - dbg ("get_name failed"); - retval = -ENODEV; + /* we only care about class devices and block stuff */ + if (!strstr(device, "class") && + !strstr(device, "block")) { + dbg("not block or class"); goto exit; } - return delete_node(name); - -exit: - return retval; -} - -int main(int argc, char *argv[]) -{ - char *subsystem; - char *action; - char *device; - char type; - int retval = -EINVAL; - - if (argc != 2) { - dbg ("unknown number of arguments"); + /* but we don't care about net class devices */ + if (strcmp(subsystem, "net") == 0) { + dbg("don't care about net devices"); goto exit; } - namedev_init(); - - /* sleep for a second or two to give the kernel a chance to - * create the dev file - */ - sleep(2); - - /* 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) { - dbg ("no device?"); + /* initialize udev database */ + retval = udevdb_init(UDEVDB_DEFAULT); + if (retval != 0) { + dbg("Unable to initialize database."); goto exit; } - dbg("looking at %s", device); + + /* initialize the naming deamon */ + namedev_init(); if (strcmp(action, "add") == 0) - return add_device(device, type); + retval = udev_add_device(device, argv[1]); - if (strcmp(action, "remove") == 0) - return remove_device(device); + else if (strcmp(action, "remove") == 0) + retval = udev_remove_device(device, argv[1]); - dbg("Unknown action: %s", action); - return -EINVAL; + else { + dbg("Unknown action: %s", action); + retval = -EINVAL; + } + udevdb_exit(); - retval = 0; exit: return retval; }