[PATCH] clean up match_place()

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 42e8032be5d818fbeab2bbc338fc51ec8cceefe7..aa45b79b13a917af91af56ae84cecea7a4cdef1f 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * 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
  *
  *
  *     This program is free software; you can redistribute it and/or modify it


@@ -227,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':
                        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':
                        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)
                        break;
                case 'c':
                        if (strlen(udev->program_result) == 0)


@@ -316,8 +317,9 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                case 'N':
                        if (udev->tmp_node[0] == '\0') {
                                dbg("create temporary device node for callout");
                case 'N':
                        if (udev->tmp_node[0] == '\0') {
                                dbg("create temporary device node for callout");

-                               snprintf(udev->tmp_node, NAME_SIZE-1, "%s/.tmp-%u-%u", udev_root, udev->major, udev->minor);
-                               udev_make_node(udev, udev->tmp_node, udev->major, udev->minor, 0600, 0, 0);
+                               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);
                        }
                        strfieldcatmax(string, udev->tmp_node, maxsize);
                        dbg("substitute temporary device node name '%s'", udev->tmp_node);


@@ -551,32 +553,27 @@ static int match_id(struct config_device *dev, struct sysfs_class_device *class_
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];

-       int found;
-       char *temp = NULL;
+       char *temp;

 
        /* we have to have a sysfs device for PLACE to work */
        if (!sysfs_device)
                return -ENODEV;
 
 
        /* we have to have a sysfs device for PLACE to work */
        if (!sysfs_device)
                return -ENODEV;
 

-       found = 0;

        strfieldcpy(path, sysfs_device->path);
        temp = strrchr(path, '/');
        dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
        strfieldcpy(path, sysfs_device->path);
        temp = strrchr(path, '/');
        dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);

-       if (strstr(temp, dev->place) != NULL) {
-               found = 1;
-       } else {
-               *temp = 0x00;
-               temp = strrchr(path, '/');
-               dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
-               if (strstr(temp, dev->place) != NULL)
-                       found = 1;
-       }
-       if (!found) {
-               dbg("place doesn't match");
-               return -ENODEV;
-       }
+       if (strstr(temp, dev->place) != NULL)
+               return 0;

 
 

-       return 0;
+       /* try the parent */
+       temp[0] = '\0';
+       temp = strrchr(path, '/');
+       dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
+       if (strstr(temp, dev->place) == NULL)
+               return 0;
+
+       dbg("place doesn't match");
+       return -ENODEV;

 }
 
 static int match_rule(struct udevice *udev, struct config_device *dev,
 }
 
 static int match_rule(struct udevice *udev, struct config_device *dev,


@@ -749,14 +746,31 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                dbg("process rule");
                if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
 
                dbg("process rule");
                if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
 

-                       /* empty name, symlink and perms will not create any node */
+                       /* FIXME: remove old style ignore rule and make OPTION="ignore" mandatory */

                        if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
                        if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&

-                           dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[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;
                        }
 
                                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 == BLOCK && 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;
                        /* apply permissions */
                        if (dev->mode != 0000) {
                                udev->mode = dev->mode;


@@ -788,11 +802,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 
                        /* rule matches */
                        if (dev->name[0] != '\0') {
 
                        /* 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[%i]' applied, '%s' becomes '%s'",
                                     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
 
                                info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
                                     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
 


@@ -800,15 +809,10 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                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;
                                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;
-
-                               udev->partitions = dev->partitions;

 
 

-                               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);
+                               if (udev->type != NET)
+                                       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);

 
                                goto exit;
                        }
 
                                goto exit;
                        }