X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=9b4d91f75cea26373c9aebc7688b0d992d0c3089;hp=971ac10809bedb81be6584cc64a16da5e6b91719;hb=60ea6945259ee0336ebd742e701a109c90e5a6ab;hpb=85511f02466297b7dca07c3fe5491230f3f06d14 diff --git a/udev.c b/udev.c index 971ac1080..9b4d91f75 100644 --- a/udev.c +++ b/udev.c @@ -3,8 +3,7 @@ * * Userspace devfs * - * Copyright (C) 2003 Greg Kroah-Hartman - * + * Copyright (C) 2003,2004 Greg Kroah-Hartman * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -24,247 +23,158 @@ #include #include #include -#include -#include #include +#include +#include +#include "libsysfs/sysfs/libsysfs.h" #include "udev.h" #include "udev_version.h" - - -static char *get_action(void) -{ - char *action; - - action = getenv("ACTION"); - return action; -} - - -static char *get_device(void) +#include "udev_dbus.h" +#include "logging.h" +#include "namedev.h" +#include "udevdb.h" + +/* global variables */ +char **main_argv; +char **main_envp; + +#ifdef LOG +unsigned char logname[LOGNAME_SIZE]; +void log_message(int level, const char *format, ...) { - static char device[255]; - char *temp; + va_list args; - temp = getenv("DEVPATH"); - if (temp == NULL) - return NULL; - strcpy(device, SYSFS_ROOT); - strcat(device, temp); + if (!udev_log) + return; - return device; + va_start(args, format); + vsyslog(level, format, args); + va_end(args); } +#endif -/* - * 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) +static void sig_handler(int signum) { - 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; + switch (signum) { + case SIGINT: + case SIGTERM: + sysbus_disconnect(); + udevdb_exit(); + exit(20 + signum); default: - break; + dbg("unhandled signal"); } - 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) +static char *subsystem_blacklist[] = { + "net", + "scsi_host", + "scsi_device", + "usb_host", + "pci_bus", + "pcmcia_socket", + "" +}; + +static int udev_hotplug(void) { - 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 *devpath; + char *subsystem; int retval = -EINVAL; - - if (argc != 2) { - dbg ("unknown number of arguments"); - 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'; + int i; + struct sigaction act; action = get_action(); if (!action) { - dbg ("no action?"); + dbg("no action?"); goto exit; } - device = get_device(); - if (!device) { - dbg ("no device?"); + devpath = get_devpath(); + if (!devpath) { + dbg("no devpath?"); goto exit; } - dbg("looking at %s", device); + dbg("looking at '%s'", devpath); - 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(devpath, "class") && + !strstr(devpath, "block")) { + dbg("not a block or class device"); goto exit; } - name = get_name(device, major, minor); - if (name == NULL) { - dbg ("get_name failed"); - retval = -ENODEV; + /* skip blacklisted subsystems */ + subsystem = get_subsystem(main_argv[1]); + if (!subsystem) { + dbg("no subsystem?"); goto exit; } + i = 0; + while (subsystem_blacklist[i][0] != '\0') { + if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { + dbg("don't care about '%s' devices", subsystem); + goto exit; + } + i++; + } - mode = get_mode(name, device, major, minor); - if (mode < 0) { - dbg ("get_mode failed"); - retval = -EINVAL; - goto exit; + /* connect to the system message bus */ + sysbus_connect(); + + /* initialize udev database */ + retval = udevdb_init(UDEVDB_DEFAULT); + if (retval != 0) { + dbg("unable to initialize database"); + goto exit_sysbus; } - retval = do_it(action, name, type, major, minor, mode); - if (retval) { - dbg ("do_it failed"); - goto exit; + /* set up a default signal handler for now */ + act.sa_handler = sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_RESTART; + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); + + /* initialize the naming deamon */ + namedev_init(); + + if (strcmp(action, "add") == 0) + retval = udev_add_device(devpath, subsystem, 0); + + else if (strcmp(action, "remove") == 0) + retval = udev_remove_device(devpath, subsystem); + + else { + dbg("unknown action '%s'", action); + retval = -EINVAL; } + udevdb_exit(); - retval = 0; -exit: - return retval; +exit_sysbus: + /* disconnect from the system message bus */ + sysbus_disconnect(); + +exit: + if (retval > 0) + retval = 0; + + return -retval; } +int main(int argc, char *argv[], char *envp[]) +{ + main_argv = argv; + main_envp = envp; + + init_logging("udev"); + + /* initialize our configuration */ + udev_init_config(); + + dbg("version %s", UDEV_VERSION); + + return udev_hotplug(); +}