chiark / gitweb /
udevadm: trigger - fix --socket== + --verbose
[elogind.git] / udevtrigger.c
index c5d88b9ee0087e841bf7ca4a18a4b53d3061a683..4e3a8fab2d633f84f79a36f2e4c8740b5a61cac6 100644 (file)
 #include <fnmatch.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #include "udev.h"
 #include "udevd.h"
+#include "udev_rules.h"
 
 static int verbose;
 static int dry_run;
@@ -41,20 +44,9 @@ LIST_HEAD(filter_subsystem_match_list);
 LIST_HEAD(filter_subsystem_nomatch_list);
 LIST_HEAD(filter_attr_match_list);
 LIST_HEAD(filter_attr_nomatch_list);
-
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
-{
-       va_list args;
-
-       if (priority > udev_log_priority)
-               return;
-
-       va_start(args, format);
-       vsyslog(priority, format, args);
-       va_end(args);
-}
-#endif
+static int sock = -1;
+static struct sockaddr_un saddr;
+static socklen_t saddrlen;
 
 /* devices that should run last cause of their dependencies */
 static int delay_device(const char *devpath)
@@ -101,7 +93,7 @@ static int device_list_insert(const char *path)
        return 0;
 }
 
-static void trigger_uevent(const char *devpath)
+static void trigger_uevent(const char *devpath, const char *action)
 {
        char filename[PATH_SIZE];
        int fd;
@@ -118,17 +110,127 @@ static void trigger_uevent(const char *devpath)
 
        fd = open(filename, O_WRONLY);
        if (fd < 0) {
-               dbg("error on opening %s: %s\n", filename, strerror(errno));
+               dbg("error on opening %s: %s", filename, strerror(errno));
                return;
        }
 
-       if (write(fd, "add", 3) < 0)
-               info("error on triggering %s: %s\n", filename, strerror(errno));
+       if (write(fd, action, strlen(action)) < 0)
+               info("error writing '%s' to '%s': %s", action, filename, strerror(errno));
 
        close(fd);
 }
 
-static void exec_list(void)
+static int pass_to_socket(const char *devpath, const char *action)
+{
+       struct udevice udev;
+       struct name_entry *name_loop;
+       char buf[4096];
+       size_t bufpos = 0;
+       ssize_t count;
+       char path[PATH_SIZE];
+       int fd;
+       char link_target[PATH_SIZE];
+       int len;
+       int err = 0;
+
+       if (verbose)
+               printf("%s\n", devpath);
+
+       udev_device_init(&udev);
+       udev_db_get_device(&udev, devpath);
+
+       /* add header */
+       bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+       bufpos++;
+
+       /* add standard keys */
+       bufpos += snprintf(&buf[bufpos], sizeof(buf)-1, "DEVPATH=%s", devpath);
+       bufpos++;
+       bufpos += snprintf(&buf[bufpos], sizeof(buf)-1, "ACTION=%s", action);
+       bufpos++;
+
+       /* add subsystem */
+       strlcpy(path, sysfs_path, sizeof(path));
+       strlcat(path, devpath, sizeof(path));
+       strlcat(path, "/subsystem", sizeof(path));
+       len = readlink(path, link_target, sizeof(link_target));
+       if (len > 0) {
+               char *pos;
+
+               link_target[len] = '\0';
+               pos = strrchr(link_target, '/');
+               if (pos != NULL) {
+                       bufpos += snprintf(&buf[bufpos], sizeof(buf)-1, "SUBSYSTEM=%s", &pos[1]);
+                       bufpos++;
+               }
+       }
+
+       /* add symlinks and node name */
+       path[0] = '\0';
+       list_for_each_entry(name_loop, &udev.symlink_list, node) {
+               strlcat(path, udev_root, sizeof(path));
+               strlcat(path, "/", sizeof(path));
+               strlcat(path, name_loop->name, sizeof(path));
+               strlcat(path, " ", sizeof(path));
+       }
+       remove_trailing_chars(path, ' ');
+       if (path[0] != '\0') {
+               bufpos += snprintf(&buf[bufpos], sizeof(buf)-1, "DEVLINKS=%s", path);
+               bufpos++;
+       }
+       if (udev.name[0] != '\0') {
+               strlcpy(path, udev_root, sizeof(path));
+               strlcat(path, "/", sizeof(path));
+               strlcat(path, udev.name, sizeof(path));
+               bufpos += snprintf(&buf[bufpos], sizeof(buf)-1, "DEVNAME=%s", path);
+               bufpos++;
+       }
+
+       /* add keys from device "uevent" file */
+       strlcpy(path, sysfs_path, sizeof(path));
+       strlcat(path, devpath, sizeof(path));
+       strlcat(path, "/uevent", sizeof(path));
+       fd = open(path, O_RDONLY);
+       if (fd >= 0) {
+               char value[4096];
+
+               count = read(fd, value, sizeof(value));
+               close(fd);
+               if (count > 0) {
+                       char *key;
+
+                       value[count] = '\0';
+                       key = value;
+                       while (key[0] != '\0') {
+                               char *next;
+
+                               next = strchr(key, '\n');
+                               if (next == NULL)
+                                       break;
+                               next[0] = '\0';
+                               bufpos += strlcpy(&buf[bufpos], key, sizeof(buf) - bufpos-1);
+                               bufpos++;
+                               key = &next[1];
+                       }
+               }
+       }
+
+       /* add keys from database */
+       list_for_each_entry(name_loop, &udev.env_list, node) {
+               bufpos += strlcpy(&buf[bufpos], name_loop->name, sizeof(buf) - bufpos-1);
+               bufpos++;
+       }
+       if (bufpos > sizeof(buf))
+               bufpos = sizeof(buf);
+
+       count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, saddrlen);
+       if (count < 0)
+               err = -1;
+
+       return err;
+}
+
+static void exec_list(const char *action)
 {
        struct name_entry *loop_device;
        struct name_entry *tmp_device;
@@ -136,15 +238,20 @@ static void exec_list(void)
        list_for_each_entry_safe(loop_device, tmp_device, &device_list, node) {
                if (delay_device(loop_device->name))
                        continue;
-
-               trigger_uevent(loop_device->name);
+               if (sock >= 0)
+                       pass_to_socket(loop_device->name, action);
+               else
+                       trigger_uevent(loop_device->name, action);
                list_del(&loop_device->node);
                free(loop_device);
        }
 
        /* trigger remaining delayed devices */
        list_for_each_entry_safe(loop_device, tmp_device, &device_list, node) {
-               trigger_uevent(loop_device->name);
+               if (sock >= 0)
+                       pass_to_socket(loop_device->name, action);
+               else
+                       trigger_uevent(loop_device->name, action);
                list_del(&loop_device->node);
                free(loop_device);
        }
@@ -237,14 +344,28 @@ static int attr_filtered(const char *path)
        return 0;
 }
 
-static void scan_bus(void)
+enum scan_type {
+       SCAN_DEVICES,
+       SCAN_SUBSYSTEM,
+};
+
+static void scan_subsystem(const char *subsys, enum scan_type scan)
 {
        char base[PATH_SIZE];
        DIR *dir;
        struct dirent *dent;
+       const char *subdir;
+
+       if (scan == SCAN_DEVICES)
+               subdir = "/devices";
+       else if (scan == SCAN_SUBSYSTEM)
+               subdir = "/drivers";
+       else
+               return;
 
        strlcpy(base, sysfs_path, sizeof(base));
-       strlcat(base, "/bus", sizeof(base));
+       strlcat(base, "/", sizeof(base));
+       strlcat(base, subsys, sizeof(base));
 
        dir = opendir(base);
        if (dir != NULL) {
@@ -256,15 +377,24 @@ static void scan_bus(void)
                        if (dent->d_name[0] == '.')
                                continue;
 
-                       if (subsystem_filtered(dent->d_name))
-                               continue;
+                       if (scan == SCAN_DEVICES)
+                               if (subsystem_filtered(dent->d_name))
+                                       continue;
 
                        strlcpy(dirname, base, sizeof(dirname));
                        strlcat(dirname, "/", sizeof(dirname));
                        strlcat(dirname, dent->d_name, sizeof(dirname));
-                       strlcat(dirname, "/devices", sizeof(dirname));
 
-                       /* look for devices */
+                       if (scan == SCAN_SUBSYSTEM) {
+                               if (!subsystem_filtered("subsystem"))
+                                       device_list_insert(dirname);
+                               if (subsystem_filtered("drivers"))
+                                       continue;
+                       }
+
+                       strlcat(dirname, subdir, sizeof(dirname));
+
+                       /* look for devices/drivers */
                        dir2 = opendir(dirname);
                        if (dir2 != NULL) {
                                for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
@@ -292,13 +422,6 @@ static void scan_block(void)
        char base[PATH_SIZE];
        DIR *dir;
        struct dirent *dent;
-       struct stat statbuf;
-
-       /* skip if "block" is already a "class" */
-       strlcpy(base, sysfs_path, sizeof(base));
-       strlcat(base, "/class/block", sizeof(base));
-       if (stat(base, &statbuf) == 0)
-               return;
 
        if (subsystem_filtered("block"))
                return;
@@ -321,7 +444,7 @@ static void scan_block(void)
                        strlcat(dirname, dent->d_name, sizeof(dirname));
                        if (attr_filtered(dirname))
                                continue;
-                       if (device_list_insert(dirname) != 0);
+                       if (device_list_insert(dirname) != 0)
                                continue;
 
                        /* look for partitions */
@@ -413,37 +536,35 @@ static void scan_failed(void)
        if (dir != NULL) {
                for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
                        char device[PATH_SIZE];
-                       size_t start, end, i;
+                       size_t start;
 
                        if (dent->d_name[0] == '.')
                                continue;
 
-                       strlcpy(device, sysfs_path, sizeof(device));
-                       start = strlcat(device, "/", sizeof(device));
-                       end = strlcat(device, dent->d_name, sizeof(device));
-                       if (end > sizeof(device))
-                               end = sizeof(device);
-
-                       /* replace PATH_TO_NAME_CHAR with '/' */
-                       for (i = start; i < end; i++)
-                               if (device[i] == PATH_TO_NAME_CHAR)
-                                       device[i] = '/';
-
+                       start = strlcpy(device, sysfs_path, sizeof(device));
+                       if(start >= sizeof(device))
+                               start = sizeof(device) - 1;
+                       strlcat(device, dent->d_name, sizeof(device));
+                       path_decode(&device[start]);
                        device_list_insert(device);
                }
                closedir(dir);
        }
 }
 
-int main(int argc, char *argv[], char *envp[])
+int udevtrigger(int argc, char *argv[], char *envp[])
 {
        int failed = 0;
+       const char *sockpath = NULL;
        int option;
+       const char *action = "add";
        static const struct option options[] = {
                { "verbose", 0, NULL, 'v' },
                { "dry-run", 0, NULL, 'n' },
                { "retry-failed", 0, NULL, 'F' },
+               { "socket", 1, NULL, 'o' },
                { "help", 0, NULL, 'h' },
+               { "action", 1, NULL, 'c' },
                { "subsystem-match", 1, NULL, 's' },
                { "subsystem-nomatch", 1, NULL, 'S' },
                { "attr-match", 1, NULL, 'a' },
@@ -457,7 +578,7 @@ int main(int argc, char *argv[], char *envp[])
        sysfs_init();
 
        while (1) {
-               option = getopt_long(argc, argv, "vnFhs:S:a:A:", options, NULL);
+               option = getopt_long(argc, argv, "vnFo:hc:s:S:a:A:", options, NULL);
                if (option == -1)
                        break;
 
@@ -471,6 +592,12 @@ int main(int argc, char *argv[], char *envp[])
                case 'F':
                        failed = 1;
                        break;
+               case 'o':
+                       sockpath = optarg;
+                       break;
+               case 'c':
+                       action = optarg;
+                       break;
                case 's':
                        name_list_add(&filter_subsystem_match_list, optarg, 0);
                        break;
@@ -484,7 +611,7 @@ int main(int argc, char *argv[], char *envp[])
                        name_list_add(&filter_attr_nomatch_list, optarg, 0);
                        break;
                case 'h':
-                       printf("Usage: udevtrigger OPTIONS\n"
+                       printf("Usage: udevadm trigger OPTIONS\n"
                               "  --verbose                       print the list of devices while running\n"
                               "  --dry-run                       do not actually trigger the events\n"
                               "  --retry-failed                  trigger only the events which have been\n"
@@ -503,14 +630,44 @@ int main(int argc, char *argv[], char *envp[])
                }
        }
 
-       if (failed)
+       if (sockpath != NULL) {
+               sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+               memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+               saddr.sun_family = AF_LOCAL;
+               /* abstract namespace only */
+               strlcpy(&saddr.sun_path[1], sockpath, sizeof(saddr.sun_path)-1);
+               saddrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+       }
+
+       if (failed) {
                scan_failed();
-       else {
-               scan_bus();
-               scan_class();
-               scan_block();
+               exec_list(action);
+       } else {
+               char base[PATH_SIZE];
+               struct stat statbuf;
+
+               /* if we have /sys/subsystem, forget all the old stuff */
+               strlcpy(base, sysfs_path, sizeof(base));
+               strlcat(base, "/subsystem", sizeof(base));
+               if (stat(base, &statbuf) == 0) {
+                       scan_subsystem("subsystem", SCAN_SUBSYSTEM);
+                       exec_list(action);
+                       scan_subsystem("subsystem", SCAN_DEVICES);
+                       exec_list(action);
+               } else {
+                       scan_subsystem("bus", SCAN_SUBSYSTEM);
+                       exec_list(action);
+                       scan_subsystem("bus", SCAN_DEVICES);
+                       scan_class();
+
+                       /* scan "block" if it isn't a "class" */
+                       strlcpy(base, sysfs_path, sizeof(base));
+                       strlcat(base, "/class/block", sizeof(base));
+                       if (stat(base, &statbuf) != 0)
+                               scan_block();
+                       exec_list(action);
+               }
        }
-       exec_list();
 
 exit:
        name_list_cleanup(&filter_subsystem_match_list);
@@ -518,6 +675,8 @@ exit:
        name_list_cleanup(&filter_attr_match_list);
        name_list_cleanup(&filter_attr_nomatch_list);
 
+       if (sock >= 0)
+               close(sock);
        sysfs_cleanup();
        logging_close();
        return 0;