X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=d39141bfc7536d1718f271502a887014eabbd12d;hp=d5d2181cb68bb427ba34c84f187aff12187e0202;hb=97adaace4f8f89ce175657d3ec71811715cc4dae;hpb=50e5de03d16be3e35e65cdf65f552807ad24e996 diff --git a/namedev_parse.c b/namedev_parse.c index d5d2181cb..d39141bfc 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -30,15 +30,17 @@ #include #include #include -#include #include #include +#include #include #include "udev.h" +#include "udev_utils.h" #include "logging.h" #include "namedev.h" + static int add_config_dev(struct config_device *new_dev) { struct config_device *tmp_dev; @@ -54,13 +56,14 @@ static int add_config_dev(struct config_device *new_dev) 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'", + "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) @@ -71,6 +74,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", @@ -85,7 +113,7 @@ void dump_perm_dev_list(void) dump_perm_dev(dev); } -/* extract possible KEY{attr} or KEY_attr */ +/* extract possible KEY{attr} */ static char *get_key_attribute(char *str) { char *pos; @@ -104,62 +132,70 @@ static char *get_key_attribute(char *str) 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(const char *filename, void *data) { - char line[255]; + char line[LINE_SIZE]; + char *bufline; int lineno; char *temp; char *temp2; char *temp3; char *attr; - FILE *fd; + char *buf; + size_t bufsize; + size_t cur; + size_t count; int program_given = 0; + int valid; int retval = 0; struct config_device dev; - fd = fopen(udev_rules_filename, "r"); - if (fd != NULL) { - dbg("reading '%s' as rules file", udev_rules_filename); + if (file_map(filename, &buf, &bufsize) == 0) { + dbg("reading '%s' as rules file", filename); } else { - dbg("can't open '%s' as a rules file", udev_rules_filename); - return -ENODEV; + dbg("can't open '%s' as rules file", filename); + return -1; } /* loop through the whole file */ + cur = 0; lineno = 0; - while (1) { - /* get a line */ - temp = fgets(line, sizeof(line), fd); - if (temp == NULL) - goto exit; + while (cur < bufsize) { + count = buf_get_line(buf, bufsize, cur); + bufline = &buf[cur]; + cur += count+1; lineno++; - dbg_parse("read '%s'", temp); - /* eat the whitespace */ - while (isspace(*temp)) - ++temp; + if (count >= LINE_SIZE) { + info("line too long, rule skipped %s, line %d", + filename, lineno); + continue; + } - /* empty line? */ - if ((*temp == '\0') || (*temp == '\n')) + /* eat the whitespace */ + while ((count > 0) && isspace(bufline[0])) { + bufline++; + count--; + } + if (count == 0) continue; /* see if this is a comment */ - if (*temp == COMMENT_CHARACTER) + if (bufline[0] == COMMENT_CHARACTER) continue; - memset(&dev, 0x00, sizeof(struct config_device)); + strncpy(line, bufline, count); + line[count] = '\0'; + dbg_parse("read '%s'", line); /* get all known keys */ + memset(&dev, 0x00, sizeof(struct config_device)); + temp = line; + valid = 0; + while (1) { retval = parse_get_pair(&temp, &temp2, &temp3); if (retval) @@ -167,16 +203,19 @@ int namedev_init_rules(void) if (strcasecmp(temp2, FIELD_BUS) == 0) { strfieldcpy(dev.bus, temp3); + valid = 1; continue; } if (strcasecmp(temp2, FIELD_ID) == 0) { strfieldcpy(dev.id, temp3); + valid = 1; continue; } if (strcasecmp(temp2, FIELD_PLACE) == 0) { strfieldcpy(dev.place, temp3); + valid = 1; continue; } @@ -201,145 +240,206 @@ int namedev_init_rules(void) } strfieldcpy(pair->file, attr); strfieldcpy(pair->value, temp3); + valid = 1; } continue; } 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_DRIVER) == 0) { + strfieldcpy(dev.driver, temp3); + valid = 1; continue; } if (strcasecmp(temp2, FIELD_PROGRAM) == 0) { program_given = 1; strfieldcpy(dev.program, temp3); + valid = 1; continue; } if (strcasecmp(temp2, FIELD_RESULT) == 0) { strfieldcpy(dev.result, temp3); + valid = 1; continue; } 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) { + if (attr != NULL) { + if (strstr(attr, ATTR_PARTITIONS) != NULL) { dbg_parse("creation of partition nodes requested"); dev.partitions = PARTITIONS_COUNT; } + if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) { + dbg_parse("remove event should be ignored"); + dev.ignore_remove = 1; + } + } strfieldcpy(dev.name, temp3); + valid = 1; continue; } if (strcasecmp(temp2, FIELD_SYMLINK) == 0) { strfieldcpy(dev.symlink, temp3); + valid = 1; + continue; + } + + if (strcasecmp(temp2, FIELD_OWNER) == 0) { + strfieldcpy(dev.owner, temp3); + valid = 1; + continue; + } + + if (strcasecmp(temp2, FIELD_GROUP) == 0) { + strfieldcpy(dev.group, temp3); + valid = 1; + continue; + } + + if (strcasecmp(temp2, FIELD_MODE) == 0) { + dev.mode = strtol(temp3, NULL, 8); + valid = 1; 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 */ + /* skip line if not any valid key was found */ + if (!valid) + goto error; + + /* simple plausibility checks for given keys */ if ((dev.sysfs_pair[0].file[0] == '\0') ^ (dev.sysfs_pair[0].value[0] == '\0')) { - dbg("inconsistency in " FIELD_SYSFS " key"); + info("inconsistency in " FIELD_SYSFS " key"); goto error; } if ((dev.result[0] != '\0') && (program_given == 0)) { - dbg(FIELD_RESULT " is only useful when " - FIELD_PROGRAM " is called in any rule before"); + info(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); + info("parse error %s, line %d:%d, rule skipped", + filename, lineno, temp - line); } } -exit: - fclose(fd); + + file_unmap(buf, bufsize); return retval; } -int namedev_init_permissions(void) +static int namedev_parse_permissions(const char *filename, void *data) { - char line[255]; + char line[LINE_SIZE]; + char *bufline; char *temp; char *temp2; - FILE *fd; + char *buf; + size_t bufsize; + size_t cur; + size_t count; int retval = 0; struct perm_device dev; + int lineno; - fd = fopen(udev_permissions_filename, "r"); - if (fd != NULL) { - dbg("reading '%s' as permissions file", udev_permissions_filename); + if (file_map(filename, &buf, &bufsize) == 0) { + dbg("reading '%s' as permissions file", filename); } else { - dbg("can't open '%s' as permissions file", udev_permissions_filename); - return -ENODEV; + dbg("can't open '%s' as permissions file", filename); + return -1; } /* loop through the whole file */ - while (1) { - temp = fgets(line, sizeof(line), fd); - if (temp == NULL) - break; - - dbg_parse("read '%s'", temp); + cur = 0; + lineno = 0; + while (cur < bufsize) { + count = buf_get_line(buf, bufsize, cur); + bufline = &buf[cur]; + cur += count+1; + lineno++; - /* eat the whitespace at the beginning of the line */ - while (isspace(*temp)) - ++temp; + if (count >= LINE_SIZE) { + info("line too long, rule skipped %s, line %d", + filename, lineno); + continue; + } - /* empty line? */ - if ((*temp == '\0') || (*temp == '\n')) + /* eat the whitespace */ + while ((count > 0) && isspace(bufline[0])) { + bufline++; + count--; + } + if (count == 0) continue; /* see if this is a comment */ - if (*temp == COMMENT_CHARACTER) + if (bufline[0] == COMMENT_CHARACTER) continue; - memset(&dev, 0x00, sizeof(dev)); + 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; } - 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.group)); + 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); @@ -348,7 +448,30 @@ int namedev_init_permissions(void) } exit: - fclose(fd); + file_unmap(buf, bufsize); return retval; } +int namedev_init_rules(void) +{ + struct stat stats; + + 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); +} + +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); +}