chiark / gitweb /
[PATCH] switch major/minor to dev_t
[elogind.git] / namedev.c
index be7ae12cd599513dd7615fa657f7d586b8846aa2..e317cc685b0079e9d78552ae57dd7e9967279428 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -183,6 +184,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
        int slen;
        struct sysfs_attribute *tmpattr;
        unsigned int next_free_number;
+       struct sysfs_class_device *class_dev_parent;
 
        pos = string;
        while (1) {
@@ -201,6 +203,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 
 
                switch (c) {
+               case 'p':
+                       if (strlen(udev->devpath) == 0)
+                               break;
+                       strfieldcatmax(string, udev->devpath, maxsize);
+                       dbg("substitute kernel name '%s'", udev->kernel_name);
+                       break;
                case 'b':
                        if (strlen(udev->bus_id) == 0)
                                break;
@@ -220,12 +228,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        dbg("substitute kernel number '%s'", udev->kernel_number);
                                break;
                case 'm':
-                       strintcatmax(string, udev->minor, maxsize);
-                       dbg("substitute minor number '%u'", udev->minor);
+                       strintcatmax(string, minor(udev->devt), maxsize);
+                       dbg("substitute minor number '%u'", minor(udev->devt));
                        break;
                case 'M':
-                       strintcatmax(string, udev->major, maxsize);
-                       dbg("substitute major number '%u'", udev->major);
+                       strintcatmax(string, major(udev->devt), maxsize);
+                       dbg("substitute major number '%u'", major(udev->devt));
                        break;
                case 'c':
                        if (strlen(udev->program_result) == 0)
@@ -290,6 +298,36 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                strfieldcatmax(string, temp2, maxsize);
                        }
                        break;
+               case 'P':
+                       class_dev_parent = sysfs_get_classdev_parent(class_dev);
+                       if (class_dev_parent != NULL) {
+                               struct udevice udev_parent;
+
+                               dbg("found parent '%s', get the node name", class_dev_parent->path);
+                               memset(&udev_parent, 0x00, sizeof(struct udevice));
+                               /* lookup the name in the udev_db with the DEVPATH of the parent */
+                               strfieldcpy(udev_parent.devpath, &class_dev_parent->path[strlen(sysfs_path)]);
+                               if (udev_db_get_device(&udev_parent) == 0) {
+                                       strfieldcatmax(string, udev_parent.name, maxsize);
+                                       dbg("substitute parent node name'%s'", udev_parent.name);
+                               } else
+                                       dbg("parent not found in database");
+                       }
+                       break;
+               case 'N':
+                       if (udev->tmp_node[0] == '\0') {
+                               dbg("create temporary device node for callout");
+                               snprintf(udev->tmp_node, NAME_SIZE, "%s/.tmp-%u-%u", udev_root, major(udev->devt), minor(udev->devt));
+                               udev->tmp_node[NAME_SIZE] = '\0';
+                               udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+                       }
+                       strfieldcatmax(string, udev->tmp_node, maxsize);
+                       dbg("substitute temporary device node name '%s'", udev->tmp_node);
+                       break;
+               case 'r':
+                       strfieldcatmax(string, udev_root, maxsize);
+                       dbg("substitute udev_root '%s'", udev_root);
+                       break;
                default:
                        dbg("unknown substitution type '%%%c'", c);
                        break;
@@ -546,7 +584,41 @@ static int match_place(struct config_device *dev, struct sysfs_class_device *cla
 static int match_rule(struct udevice *udev, struct config_device *dev,
                      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
+       /* check for matching kernel name */
+       if (dev->kernel[0] != '\0') {
+               dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'",
+                   dev->kernel, class_dev->name);
+               if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
+                       dbg(FIELD_KERNEL " is not matching");
+                       goto exit;
+               }
+               dbg(FIELD_KERNEL " matches");
+       }
+
+       /* check for matching subsystem */
+       if (dev->subsystem[0] != '\0') {
+               dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
+                   dev->subsystem, class_dev->name);
+               if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
+                       dbg(FIELD_SUBSYSTEM " is not matching");
+                       goto exit;
+               }
+               dbg(FIELD_SUBSYSTEM " matches");
+       }
+
+       /* walk up the chain of physical devices and find a match */
        while (1) {
+               /* check for matching driver */
+               if (dev->driver[0] != '\0') {
+                       dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'",
+                           dev->driver, sysfs_device->driver_name);
+                       if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
+                               dbg(FIELD_DRIVER " is not matching");
+                               goto try_parent;
+                       }
+                       dbg(FIELD_DRIVER " matches");
+               }
+
                /* check for matching bus value */
                if (dev->bus[0] != '\0') {
                        if (sysfs_device == NULL) {
@@ -558,45 +630,8 @@ static int match_rule(struct udevice *udev, struct config_device *dev,
                        if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
                                dbg(FIELD_BUS " is not matching");
                                goto try_parent;
-                       } else {
-                               dbg(FIELD_BUS " matches");
-                       }
-               }
-
-               /* check for matching kernel name */
-               if (dev->kernel[0] != '\0') {
-                       dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'",
-                           dev->kernel, class_dev->name);
-                       if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
-                               dbg(FIELD_KERNEL " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_KERNEL " matches");
-                       }
-               }
-
-               /* check for matching subsystem */
-               if (dev->subsystem[0] != '\0') {
-                       dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
-                           dev->subsystem, class_dev->name);
-                       if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
-                               dbg(FIELD_SUBSYSTEM " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_SUBSYSTEM " matches");
-                       }
-               }
-
-               /* check for matching driver */
-               if (dev->driver[0] != '\0') {
-                       dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'",
-                           dev->driver, sysfs_device->driver_name);
-                       if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
-                               dbg(FIELD_DRIVER " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_DRIVER " matches");
                        }
+                       dbg(FIELD_BUS " matches");
                }
 
                /* check for matching bus id */
@@ -605,9 +640,8 @@ static int match_rule(struct udevice *udev, struct config_device *dev,
                        if (match_id(dev, class_dev, sysfs_device) != 0) {
                                dbg(FIELD_ID " is not matching");
                                goto try_parent;
-                       } else {
-                               dbg(FIELD_ID " matches");
                        }
+                       dbg(FIELD_ID " matches");
                }
 
                /* check for matching place of device */
@@ -616,9 +650,8 @@ static int match_rule(struct udevice *udev, struct config_device *dev,
                        if (match_place(dev, class_dev, sysfs_device) != 0) {
                                dbg(FIELD_PLACE " is not matching");
                                goto try_parent;
-                       } else {
-                               dbg(FIELD_PLACE " matches");
                        }
+                       dbg(FIELD_PLACE " matches");
                }
 
                /* check for matching sysfs pairs */
@@ -627,50 +660,51 @@ static int match_rule(struct udevice *udev, struct config_device *dev,
                        if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
                                dbg(FIELD_SYSFS " is not matching");
                                goto try_parent;
-                       } else {
-                               dbg(FIELD_SYSFS " matches");
-                       }
-               }
-
-               /* execute external program */
-               if (dev->program[0] != '\0') {
-                       char program[PROGRAM_SIZE];
-
-                       dbg("check " FIELD_PROGRAM);
-                       strfieldcpy(program, dev->program);
-                       apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-                       if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
-                               dbg(FIELD_PROGRAM " returned nonzero");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_PROGRAM " returned successful");
-                       }
-               }
-
-               /* check for matching result of external program */
-               if (dev->result[0] != '\0') {
-                       dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
-                           dev->result, udev->program_result);
-                       if (strcmp_pattern(dev->result, udev->program_result) != 0) {
-                               dbg(FIELD_RESULT " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_RESULT " matches");
                        }
+                       dbg(FIELD_SYSFS " matches");
                }
 
-               /* Yeah, we matched! */
-               return 0;
-
+               /* found matching physical device  */
+               break;
 try_parent:
                dbg("try parent sysfs device");
                sysfs_device = sysfs_get_device_parent(sysfs_device);
                if (sysfs_device == NULL)
-                       return -ENODEV;
+                       goto exit;
                dbg("sysfs_device->path='%s'", sysfs_device->path);
                dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
        }
 
+       /* execute external program */
+       if (dev->program[0] != '\0') {
+               char program[PROGRAM_SIZE];
+
+               dbg("check " FIELD_PROGRAM);
+               strfieldcpy(program, dev->program);
+               apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
+               if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
+                       dbg(FIELD_PROGRAM " returned nonzero");
+                       goto try_parent;
+               }
+               dbg(FIELD_PROGRAM " returned successful");
+       }
+
+       /* check for matching result of external program */
+       if (dev->result[0] != '\0') {
+               dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
+                   dev->result, udev->program_result);
+               if (strcmp_pattern(dev->result, udev->program_result) != 0) {
+                       dbg(FIELD_RESULT " is not matching");
+                       goto try_parent;
+               }
+               dbg(FIELD_RESULT " matches");
+       }
+
+       /* rule matches */
+       return 0;
+
+exit:
+       return -1;
 }
 
 int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
@@ -680,7 +714,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        struct config_device *dev;
        char *pos;
 
-       udev->mode = 0;
        dbg("class_dev->name='%s'", class_dev->name);
 
        /* Figure out where the "device"-symlink is at.  For char devices this will
@@ -717,18 +750,53 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        list_for_each_entry(dev, &config_device_list, node) {
                dbg("process rule");
                if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
-                       /* empty name and symlink will not create any node */
-                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
-                               info("configured rule in '%s' at line %i applied, '%s' is ignored",
+
+                       /* FIXME: remove old style ignore rule and make OPTION="ignore" mandatory */
+                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
+                           dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0' &&
+                           !dev->ignore_device && !dev->partitions && !dev->ignore_remove) {
+                               info("configured rule in '%s[%i]' applied, '%s' is ignored",
+                                    dev->config_file, dev->config_line, udev->kernel_name);
+                               return -1;
+                       }
+
+                       /* apply options */
+                       if (dev->ignore_device) {
+                               info("configured rule in '%s[%i]' applied, '%s' is ignored",
                                     dev->config_file, dev->config_line, udev->kernel_name);
                                return -1;
                        }
+                       if (dev->ignore_remove) {
+                               udev->ignore_remove = dev->ignore_remove;
+                               dbg_parse("remove event should be ignored");
+                       }
+                       /* apply all_partitions option only at a main block device */
+                       if (dev->partitions && udev->type == 'b' && udev->kernel_number[0] == '\0') {
+                               udev->partitions = dev->partitions;
+                               dbg("creation of partition nodes requested");
+                       }
+
+                       /* apply permissions */
+                       if (dev->mode != 0000) {
+                               udev->mode = dev->mode;
+                               dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+                       }
+                       if (dev->owner[0] != '\0') {
+                               strfieldcpy(udev->owner, dev->owner);
+                               apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+                               dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
+                       }
+                       if (dev->group[0] != '\0') {
+                               strfieldcpy(udev->group, dev->group);
+                               apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+                               dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
+                       }
 
-                       /* collect symlinks for the final matching rule */
+                       /* collect symlinks for this or the final matching rule */
                        if (dev->symlink[0] != '\0') {
                                char temp[NAME_SIZE];
 
-                               info("configured rule in '%s' at line %i applied, added symlink '%s'",
+                               info("configured rule in '%s[%i]' applied, added symlink '%s'",
                                     dev->config_file, dev->config_line, dev->symlink);
                                strfieldcpy(temp, dev->symlink);
                                apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
@@ -739,53 +807,33 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 
                        /* rule matches */
                        if (dev->name[0] != '\0') {
-                               /* apply all_partitions flag only at a main block device */
-                               if (dev->partitions > 0 &&
-                                   (udev->type != 'b' || udev->kernel_number[0] != '\0'))
-                                       continue;
-
-                               info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+                               info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
                                     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
 
                                strfieldcpy(udev->name, dev->name);
                                apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
                                strfieldcpy(udev->config_file, dev->config_file);
                                udev->config_line = dev->config_line;
-                               udev->ignore_remove = dev->ignore_remove;
 
-                               if (udev->type == 'n')
-                                       goto exit;
+                               if (udev->type != 'n')
+                                       dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
+                                           udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
 
-                               udev->partitions = dev->partitions;
-                               udev->mode = dev->mode;
-                               strfieldcpy(udev->owner, dev->owner);
-                               apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
-                               strfieldcpy(udev->group, dev->group);
-                               apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
-
-                               goto perms;
+                               goto exit;
                        }
                }
        }
 
        /* no rule matched, so we use the kernel name */
        strfieldcpy(udev->name, udev->kernel_name);
-
-       if (udev->type == 'n')
-               goto exit;
-
-perms:
-       /* apply default permissions to empty fields */
-       if (udev->mode == 0000)
-               udev->mode = default_mode;
-       if (udev->owner[0] == '\0')
-               strfieldcpy(udev->owner, default_owner);
-       if (udev->group[0] == '\0')
-               strfieldcpy(udev->group, default_group);
-
-       dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
-           udev->name, udev->owner, udev->group, udev->mode);
+       dbg("no rule found, use kernel name '%s'", udev->name);
 
 exit:
+       if (udev->tmp_node[0] != '\0') {
+               dbg("removing temporary device node");
+               unlink_secure(udev->tmp_node);
+               udev->tmp_node[0] = '\0';
+       }
+
        return 0;
 }