chiark / gitweb /
[PATCH] detect NAME="" as ignore_device rule
[elogind.git] / namedev_parse.c
index cc02d255556fea76c052f1755f6cbb70a65fdce3..7cd676c390dd7c900e685980238d8cf73dcbddff 100644 (file)
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003,2004 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
 #include <errno.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 #include "namedev.h"
 
+LIST_HEAD(config_device_list);
 
 static int add_config_dev(struct config_device *new_dev)
 {
@@ -74,46 +76,7 @@ void dump_config_dev_list(void)
                dump_config_dev(dev);
 }
 
-static int add_perm_dev(struct perm_device *new_dev)
-{
-       struct perm_device *dev;
-       struct perm_device *tmp_dev;
-
-       /* update the values if we already have the device */
-       list_for_each_entry(dev, &perm_device_list, node) {
-               if (strcmp(new_dev->name, dev->name) != 0)
-                       continue;
-
-               set_empty_perms(dev, new_dev->mode, new_dev->owner, new_dev->group);
-               return 0;
-       }
-
-       /* not found, add new structure to the perm list */
-       tmp_dev = malloc(sizeof(*tmp_dev));
-       if (!tmp_dev)
-               return -ENOMEM;
-
-       memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
-       list_add_tail(&tmp_dev->node, &perm_device_list);
-       //dump_perm_dev(tmp_dev);
-       return 0;
-}
-
-void dump_perm_dev(struct perm_device *dev)
-{
-       dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
-                 dev->name, dev->owner, dev->group, dev->mode);
-}
-
-void dump_perm_dev_list(void)
-{
-       struct perm_device *dev;
-
-       list_for_each_entry(dev, &perm_device_list, node)
-               dump_perm_dev(dev);
-}
-
-/* extract possible KEY{attr} or KEY_attr */
+/* extract possible KEY{attr} */
 static char *get_key_attribute(char *str)
 {
        char *pos;
@@ -132,17 +95,10 @@ static char *get_key_attribute(char *str)
                return attr;
        }
 
-       attr = strchr(str, '_');
-       if (attr != NULL) {
-               attr++;
-               dbg("attribute='%s'", attr);
-               return attr;
-       }
-
        return NULL;
 }
 
-static int namedev_parse_rules(const char *filename, void *data)
+static int namedev_parse(const char *filename, void *data)
 {
        char line[LINE_SIZE];
        char *bufline;
@@ -171,14 +127,15 @@ static int namedev_parse_rules(const char *filename, void *data)
        cur = 0;
        lineno = 0;
        while (cur < bufsize) {
+               unsigned int i, j;
+
                count = buf_get_line(buf, bufsize, cur);
                bufline = &buf[cur];
                cur += count+1;
                lineno++;
 
                if (count >= LINE_SIZE) {
-                       info("line too long, rule skipped %s, line %d",
-                            filename, lineno);
+                       info("line too long, rule skipped %s, line %d", filename, lineno);
                        continue;
                }
 
@@ -194,8 +151,14 @@ static int namedev_parse_rules(const char *filename, void *data)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strncpy(line, bufline, count);
-               line[count] = '\0';
+               /* skip backslash and newline from multi line rules */
+               for (i = j = 0; i < count; i++) {
+                       if (bufline[i] == '\\' || bufline[i] == '\n')
+                               continue;
+
+                       line[j++] = bufline[i];
+               }
+               line[j] = '\0';
                dbg_parse("read '%s'", line);
 
                /* get all known keys */
@@ -208,6 +171,18 @@ static int namedev_parse_rules(const char *filename, void *data)
                        if (retval)
                                break;
 
+                       if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+                               strfieldcpy(dev.kernel, temp3);
+                               valid = 1;
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
+                               strfieldcpy(dev.subsystem, temp3);
+                               valid = 1;
+                               continue;
+                       }
+
                        if (strcasecmp(temp2, FIELD_BUS) == 0) {
                                strfieldcpy(dev.bus, temp3);
                                valid = 1;
@@ -252,14 +227,8 @@ static int namedev_parse_rules(const char *filename, void *data)
                                continue;
                        }
 
-                       if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-                               strfieldcpy(dev.kernel, temp3);
-                               valid = 1;
-                               continue;
-                       }
-
-                       if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
-                               strfieldcpy(dev.subsystem, temp3);
+                       if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
+                               strfieldcpy(dev.driver, temp3);
                                valid = 1;
                                continue;
                        }
@@ -279,11 +248,21 @@ static int namedev_parse_rules(const char *filename, void *data)
 
                        if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
                                attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
-                               if (attr != NULL && strcasecmp(attr, ATTR_PARTITIONS) == 0) {
+                               /* FIXME: remove old style options and make OPTIONS= mandatory */
+                               if (attr != NULL) {
+                                       if (strstr(attr, ATTR_PARTITIONS) != NULL) {
                                                dbg_parse("creation of partition nodes requested");
-                                               dev.partitions = PARTITIONS_COUNT;
+                                               dev.partitions = DEFAULT_PARTITIONS_COUNT;
                                        }
-                               strfieldcpy(dev.name, temp3);
+                                       if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) {
+                                               dbg_parse("remove event should be ignored");
+                                               dev.ignore_remove = 1;
+                                       }
+                               }
+                               if (temp3[0] != '\0')
+                                       strfieldcpy(dev.name, temp3);
+                               else
+                                       dev.ignore_device = 1;
                                valid = 1;
                                continue;
                        }
@@ -312,6 +291,23 @@ static int namedev_parse_rules(const char *filename, void *data)
                                continue;
                        }
 
+                       if (strcasecmp(temp2, FIELD_OPTIONS) == 0) {
+                               if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) {
+                                       dbg_parse("device should be ignored");
+                                       dev.ignore_device = 1;
+                               }
+                               if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) {
+                                       dbg_parse("remove event should be ignored");
+                                       dev.ignore_remove = 1;
+                               }
+                               if (strstr(temp3, ATTR_PARTITIONS) != NULL) {
+                                       dbg_parse("creation of partition nodes requested");
+                                       dev.partitions = DEFAULT_PARTITIONS_COUNT;
+                               }
+                               valid = 1;
+                               continue;
+                       }
+
                        dbg("unknown type of field '%s'", temp2);
                        goto error;
                }
@@ -349,124 +345,29 @@ error:
        return retval;
 }
 
-static int namedev_parse_permissions(const char *filename, void *data)
+int namedev_init(void)
 {
-       char line[LINE_SIZE];
-       char *bufline;
-       char *temp;
-       char *temp2;
-       char *buf;
-       size_t bufsize;
-       size_t cur;
-       size_t count;
-       int retval = 0;
-       struct perm_device dev;
-       int lineno;
+       struct stat stats;
+       int retval;
 
-       if (file_map(filename, &buf, &bufsize) == 0) {
-               dbg("reading '%s' as permissions file", filename);
-       } else {
-               dbg("can't open '%s' as permissions file", filename);
+       if (stat(udev_rules_filename, &stats) != 0)
                return -1;
-       }
-
-       /* loop through the whole file */
-       cur = 0;
-       lineno = 0;
-       while (cur < bufsize) {
-               count = buf_get_line(buf, bufsize, cur);
-               bufline = &buf[cur];
-               cur += count+1;
-               lineno++;
-
-               if (count >= LINE_SIZE) {
-                       info("line too long, rule skipped %s, line %d",
-                            filename, lineno);
-                       continue;
-               }
-
-               /* eat the whitespace */
-               while ((count > 0) && isspace(bufline[0])) {
-                       bufline++;
-                       count--;
-               }
-               if (count == 0)
-                       continue;
-
-               /* see if this is a comment */
-               if (bufline[0] == COMMENT_CHARACTER)
-                       continue;
-
-               strncpy(line, bufline, count);
-               line[count] = '\0';
-               dbg_parse("read '%s'", line);
-
-               /* parse the line */
-               memset(&dev, 0x00, sizeof(struct perm_device));
-               temp = line;
-
-               temp2 = strsep(&temp, ":");
-               if (!temp2) {
-                       dbg("cannot parse line '%s'", line);
-                       continue;
-               }
-               strfieldcpy(dev.name, temp2);
-
-               temp2 = strsep(&temp, ":");
-               if (!temp2) {
-                       dbg("cannot parse line '%s'", line);
-                       continue;
-               }
-               strfieldcpy(dev.owner, temp2);
 
-               temp2 = strsep(&temp, ":");
-               if (!temp2) {
-                       dbg("cannot parse line '%s'", line);
-                       continue;
-               }
-               strfieldcpy(dev.group, temp2);
-
-               if (!temp) {
-                       dbg("cannot parse line '%s'", line);
-                       continue;
-               }
-               dev.mode = strtol(temp, NULL, 8);
-
-               dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
-                         dev.name, dev.owner, dev.group, dev.mode);
-
-               retval = add_perm_dev(&dev);
-               if (retval) {
-                       dbg("add_perm_dev returned with error %d", retval);
-                       goto exit;
-               }
-       }
+       if ((stats.st_mode & S_IFMT) != S_IFDIR)
+               retval = namedev_parse(udev_rules_filename, NULL);
+       else
+               retval = call_foreach_file(namedev_parse, udev_rules_filename, RULEFILE_SUFFIX, NULL);
 
-exit:
-       file_unmap(buf, bufsize);
        return retval;
 }
 
-int namedev_init_rules(void)
+void namedev_close(void)
 {
-       struct stat stats;
+       struct config_device *dev;
 
-       stat(udev_rules_filename, &stats);
-       if ((stats.st_mode & S_IFMT) != S_IFDIR)
-               return namedev_parse_rules(udev_rules_filename, NULL);
-       else
-               return call_foreach_file(namedev_parse_rules, udev_rules_filename,
-                                        RULEFILE_SUFFIX, NULL);
+       list_for_each_entry(dev, &config_device_list, node) {
+               list_del(&dev->node);
+               free(dev);
+       }
 }
 
-int namedev_init_permissions(void)
-{
-       struct stat stats;
-
-       stat(udev_permissions_filename, &stats);
-       if ((stats.st_mode & S_IFMT) != S_IFDIR)
-               return namedev_parse_permissions(udev_permissions_filename, NULL);
-       else
-               return call_foreach_file(namedev_parse_permissions, udev_permissions_filename,
-                                        PERMFILE_SUFFIX, NULL);
-}