chiark / gitweb /
[PATCH] remove extra ; in namedev_parse.c
[elogind.git] / namedev_parse.c
index 0712c3b44769350d268845b2bd858d5588407fa8..8198f7e684c35d402af9e2f49b3fdf9edd34c234 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *
  *     This program is free software; you can redistribute it and/or modify it
 #include <fcntl.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <dirent.h>
 #include <errno.h>
 
 #include "udev.h"
+#include "logging.h"
 #include "namedev.h"
 
+LIST_HEAD(file_list);
+
+
 static int add_config_dev(struct config_device *new_dev)
 {
        struct config_device *tmp_dev;
@@ -51,50 +57,16 @@ static int add_config_dev(struct config_device *new_dev)
        return 0;
 }
 
-int get_pair(char **orig_string, char **left, char **right)
-{
-       char *temp;
-       char *string = *orig_string;
-
-       if (!string)
-               return -ENODEV;
-
-       /* eat any whitespace */
-       while (isspace(*string) || *string == ',')
-               ++string;
-
-       /* split based on '=' */
-       temp = strsep(&string, "=");
-       *left = temp;
-       if (!string)
-               return -ENODEV;
-
-       /* take the right side and strip off the '"' */
-       while (isspace(*string))
-               ++string;
-       if (*string == '"')
-               ++string;
-       else
-               return -ENODEV;
-
-       temp = strsep(&string, "\"");
-       if (!string || *temp == '\0')
-               return -ENODEV;
-       *right = temp;
-       *orig_string = string;
-       
-       return 0;
-}
-
 void dump_config_dev(struct config_device *dev)
 {
-       /*FIXME dump all sysfs's */
        dbg_parse("name='%s', symlink='%s', bus='%s', place='%s', id='%s', "
                  "sysfs_file[0]='%s', sysfs_value[0]='%s', "
                  "kernel='%s', program='%s', result='%s'",
+                 "owner='%s', group='%s', mode=%#o",
                  dev->name, dev->symlink, dev->bus, dev->place, dev->id,
                  dev->sysfs_pair[0].file, dev->sysfs_pair[0].value,
-                 dev->kernel, dev->program, dev->result);
+                 dev->kernel, dev->program, dev->result,
+                 dev->owner, dev->group, dev->mode);
 }
 
 void dump_config_dev_list(void)
@@ -105,6 +77,31 @@ 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",
@@ -119,24 +116,53 @@ void dump_perm_dev_list(void)
                dump_perm_dev(dev);
 }
 
+/* extract possible KEY{attr} or KEY_attr */
+static char *get_key_attribute(char *str)
+{
+       char *pos;
+       char *attr;
+
+       attr = strchr(str, '{');
+       if (attr != NULL) {
+               attr++;
+               pos = strchr(attr, '}');
+               if (pos == NULL) {
+                       dbg("missing closing brace for format");
+                       return NULL;
+               }
+               pos[0] = '\0';
+               dbg("attribute='%s'", attr);
+               return attr;
+       }
+
+       attr = strchr(str, '_');
+       if (attr != NULL) {
+               attr++;
+               dbg("attribute='%s'", attr);
+               return attr;
+       }
+
+       return NULL;
+}
 
-int namedev_init_rules(void)
+static int namedev_parse_rules(char *filename)
 {
        char line[255];
        int lineno;
        char *temp;
        char *temp2;
        char *temp3;
+       char *attr;
        FILE *fd;
        int program_given = 0;
        int retval = 0;
        struct config_device dev;
 
-       fd = fopen(udev_rules_filename, "r");
+       fd = fopen(filename, "r");
        if (fd != NULL) {
-               dbg("reading '%s' as rules file", udev_rules_filename);
+               dbg("reading '%s' as rules file", filename);
        } else {
-               dbg("can't open '%s' as a rules file", udev_rules_filename);
+               dbg("can't open '%s' as a rules file", filename);
                return -ENODEV;
        }
 
@@ -166,7 +192,7 @@ int namedev_init_rules(void)
 
                /* get all known keys */
                while (1) {
-                       retval = get_pair(&temp, &temp2, &temp3);
+                       retval = parse_get_pair(&temp, &temp2, &temp3);
                        if (retval)
                                break;
 
@@ -199,8 +225,12 @@ int namedev_init_rules(void)
                                        ++pair;
                                }
                                if (pair) {
-                                       /* remove prepended 'SYSFS_' */
-                                       strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
+                                       attr = get_key_attribute(temp2 + sizeof(FIELD_SYSFS)-1);
+                                       if (attr == NULL) {
+                                               dbg("error parsing " FIELD_SYSFS " attribute");
+                                               continue;
+                                       }
+                                       strfieldcpy(pair->file, attr);
                                        strfieldcpy(pair->value, temp3);
                                }
                                continue;
@@ -222,7 +252,13 @@ int namedev_init_rules(void)
                                continue;
                        }
 
-                       if (strcasecmp(temp2, FIELD_NAME) == 0) {
+                       if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
+                               attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
+                               if (attr != NULL)
+                                       if (strcasecmp(attr, ATTR_PARTITIONS) == 0) {
+                                               dbg_parse("creation of partition nodes requested");
+                                               dev.partitions = PARTITIONS_COUNT;
+                                       }
                                strfieldcpy(dev.name, temp3);
                                continue;
                        }
@@ -232,30 +268,47 @@ int namedev_init_rules(void)
                                continue;
                        }
 
+                       if (strcasecmp(temp2, FIELD_OWNER) == 0) {
+                               strfieldcpy(dev.owner, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_GROUP) == 0) {
+                               strfieldcpy(dev.group, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_MODE) == 0) {
+                               dev.mode = strtol(temp3, NULL, 8);
+                               continue;
+                       }
+
                        dbg("unknown type of field '%s'", temp2);
-                       dbg("You might be using a rules file in the old format, please fix.");
                        goto error;
                }
 
-               /* simple plausibility check for given keys */
+               /* simple plausibility checks for given keys */
                if ((dev.sysfs_pair[0].file[0] == '\0') ^
                    (dev.sysfs_pair[0].value[0] == '\0')) {
-                       dbg("inconsistency in SYSFS_ key");
+                       dbg("inconsistency in " FIELD_SYSFS " key");
                        goto error;
                }
 
                if ((dev.result[0] != '\0') && (program_given == 0)) {
-                       dbg("RESULT is only useful when PROGRAM called in any rule before");
+                       dbg(FIELD_RESULT " is only useful when "
+                           FIELD_PROGRAM " is called in any rule before");
                        goto error;
                }
 
+               dev.config_line = lineno;
+               strfieldcpy(dev.config_file, filename);
                retval = add_config_dev(&dev);
                if (retval) {
                        dbg("add_config_dev returned with error %d", retval);
                        continue;
 error:
                        dbg("%s:%d:%d: parse error, rule skipped",
-                                 udev_rules_filename, lineno, temp - line);
+                           filename, lineno, temp - line);
                }
        }
 exit:
@@ -263,7 +316,7 @@ exit:
        return retval;
 }
 
-int namedev_init_permissions(void)
+static int namedev_parse_permissions(char *filename)
 {
        char line[255];
        char *temp;
@@ -272,11 +325,11 @@ int namedev_init_permissions(void)
        int retval = 0;
        struct perm_device dev;
 
-       fd = fopen(udev_permissions_filename, "r");
+       fd = fopen(filename, "r");
        if (fd != NULL) {
-               dbg("reading '%s' as permissions file", udev_permissions_filename);
+               dbg("reading '%s' as permissions file", filename);
        } else {
-               dbg("can't open '%s' as permissions file", udev_permissions_filename);
+               dbg("can't open '%s' as permissions file", filename);
                return -ENODEV;
        }
 
@@ -308,31 +361,31 @@ int namedev_init_permissions(void)
                        dbg("cannot parse line '%s'", line);
                        continue;
                }
-               strncpy(dev.name, temp2, sizeof(dev.name));
+               strfieldcpy(dev.name, temp2);
 
                temp2 = strsep(&temp, ":");
                if (!temp2) {
                        dbg("cannot parse line '%s'", line);
                        continue;
                }
-               strncpy(dev.owner, temp2, sizeof(dev.owner));
+               strfieldcpy(dev.owner, temp2);
 
                temp2 = strsep(&temp, ":");
                if (!temp2) {
                        dbg("cannot parse line '%s'", line);
                        continue;
                }
-               strncpy(dev.group, temp2, sizeof(dev.owner));
+               strfieldcpy(dev.group, temp2);
 
                if (!temp) {
-                       dbg("cannot parse line: %s", line);
+                       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);
+                         dev.name, dev.owner, dev.group, dev.mode);
+
                retval = add_perm_dev(&dev);
                if (retval) {
                        dbg("add_perm_dev returned with error %d", retval);
@@ -343,6 +396,90 @@ int namedev_init_permissions(void)
 exit:
        fclose(fd);
        return retval;
-}      
+}
 
+struct files {
+       struct list_head list;
+       char name[NAME_SIZE];
+};
 
+/* sort files in lexical order */
+static int file_list_insert(char *filename)
+{
+       struct files *loop_file;
+       struct files *new_file;
+
+       list_for_each_entry(loop_file, &file_list, list) {
+               if (strcmp(loop_file->name, filename) > 0) {
+                       break;
+               }
+       }
+
+       new_file = malloc(sizeof(struct files));
+       if (new_file == NULL) {
+               dbg("error malloc");
+               return -ENOMEM;
+       }
+
+       strfieldcpy(new_file->name, filename);
+       list_add_tail(&new_file->list, &loop_file->list);
+       return 0;
+}
+
+/* calls function for file or every file found in directory */
+static int call_foreach_file(int parser (char *f) , char *filename, char *extension)
+{
+       struct dirent *ent;
+       DIR *dir;
+       char *ext;
+       char file[NAME_SIZE];
+       struct stat stats;
+       struct files *loop_file;
+       struct files *tmp_file;
+
+       /* look if we have a plain file or a directory to scan */
+       stat(filename, &stats);
+       if ((stats.st_mode & S_IFMT) != S_IFDIR)
+               return parser(filename);
+
+       /* sort matching filename into list */
+       dbg("open config as directory '%s'", filename);
+       dir = opendir(filename);
+       while (1) {
+               ent = readdir(dir);
+               if (ent == NULL || ent->d_name[0] == '\0')
+                       break;
+
+               dbg("found file '%s'", ent->d_name);
+               ext = strrchr(ent->d_name, '.');
+               if (ext == NULL)
+                       continue;
+
+               if (strcmp(ext, extension) == 0) {
+                       dbg("put file in list '%s'", ent->d_name);
+                       file_list_insert(ent->d_name);
+               }
+       }
+
+       /* parse every file in the list */
+       list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
+               strfieldcpy(file, filename);
+               strfieldcat(file, loop_file->name);
+               parser(file);
+               list_del(&loop_file->list);
+               free(loop_file);
+       }
+
+       closedir(dir);
+       return 0;
+}
+
+int namedev_init_rules()
+{
+       return call_foreach_file(namedev_parse_rules, udev_rules_filename, RULEFILE_EXT);
+}
+
+int namedev_init_permissions()
+{
+       return call_foreach_file(namedev_parse_permissions, udev_permissions_filename, PERMFILE_EXT);
+}