#include <sys/stat.h>
#include <errno.h>
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#include "logging.h"
void dump_config_dev(struct config_device *dev)
{
- dbg_parse("name='%s', symlink='%s', bus='%s', place='%s', id='%s', "
+ dbg_parse("name='%s', symlink='%s', bus='%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->name, dev->symlink, dev->bus, dev->id,
dev->sysfs_pair[0].file, dev->sysfs_pair[0].value,
dev->kernel, dev->program, dev->result,
dev->owner, dev->group, dev->mode);
return NULL;
}
-static int namedev_parse(const char *filename, void *data)
+static int namedev_parse(struct udevice *udev, const char *filename)
{
char line[LINE_SIZE];
char *bufline;
cur += count+1;
lineno++;
- if (count >= LINE_SIZE) {
+ if (count >= sizeof(line)) {
info("line too long, rule skipped %s, line %d", filename, lineno);
continue;
}
/* skip backslash and newline from multi line rules */
for (i = j = 0; i < count; i++) {
- if (bufline[i] == '\\' || bufline[i] == '\n')
+ if (bufline[i] == '\\' && bufline[i+1] == '\n')
continue;
line[j++] = bufline[i];
break;
if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
- strfieldcpy(dev.kernel, temp3);
+ strlcpy(dev.kernel, temp3, sizeof(dev.kernel));
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
- strfieldcpy(dev.subsystem, temp3);
+ strlcpy(dev.subsystem, temp3, sizeof(dev.subsystem));
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_BUS) == 0) {
- strfieldcpy(dev.bus, temp3);
+ strlcpy(dev.bus, temp3, sizeof(dev.bus));
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);
+ strlcpy(dev.id, temp3, sizeof(dev.id));
valid = 1;
continue;
}
dbg("error parsing " FIELD_SYSFS " attribute");
continue;
}
- strfieldcpy(pair->file, attr);
- strfieldcpy(pair->value, temp3);
+ strlcpy(pair->file, attr, sizeof(pair->file));
+ strlcpy(pair->value, temp3, sizeof(pair->value));
valid = 1;
}
continue;
}
if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
- strfieldcpy(dev.driver, temp3);
+ strlcpy(dev.driver, temp3, sizeof(dev.driver));
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
program_given = 1;
- strfieldcpy(dev.program, temp3);
+ strlcpy(dev.program, temp3, sizeof(dev.program));
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_RESULT) == 0) {
- strfieldcpy(dev.result, temp3);
+ strlcpy(dev.result, temp3, sizeof(dev.result));
valid = 1;
continue;
}
attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
/* FIXME: remove old style options and make OPTIONS= mandatory */
if (attr != NULL) {
- if (strstr(attr, ATTR_PARTITIONS) != NULL) {
+ if (strstr(attr, OPTION_PARTITIONS) != NULL) {
dbg_parse("creation of partition nodes requested");
dev.partitions = DEFAULT_PARTITIONS_COUNT;
}
- if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) {
+ if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) {
dbg_parse("remove event should be ignored");
dev.ignore_remove = 1;
}
}
- strfieldcpy(dev.name, temp3);
+ if (temp3[0] != '\0')
+ strlcpy(dev.name, temp3, sizeof(dev.name));
+ else
+ dev.ignore_device = 1;
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_SYMLINK) == 0) {
- strfieldcpy(dev.symlink, temp3);
+ strlcpy(dev.symlink, temp3, sizeof(dev.symlink));
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_OWNER) == 0) {
- strfieldcpy(dev.owner, temp3);
+ strlcpy(dev.owner, temp3, sizeof(dev.owner));
valid = 1;
continue;
}
if (strcasecmp(temp2, FIELD_GROUP) == 0) {
- strfieldcpy(dev.group, temp3);
+ strlcpy(dev.group, temp3, sizeof(dev.group));
valid = 1;
continue;
}
}
if (strcasecmp(temp2, FIELD_OPTIONS) == 0) {
- if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) {
+ if (strstr(temp3, OPTION_IGNORE_DEVICE) != NULL) {
dbg_parse("device should be ignored");
dev.ignore_device = 1;
}
- if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) {
+ if (strstr(temp3, OPTION_IGNORE_REMOVE) != NULL) {
dbg_parse("remove event should be ignored");
dev.ignore_remove = 1;
}
- if (strstr(temp3, ATTR_PARTITIONS) != NULL) {
+ if (strstr(temp3, OPTION_PARTITIONS) != NULL) {
dbg_parse("creation of partition nodes requested");
dev.partitions = DEFAULT_PARTITIONS_COUNT;
}
}
dev.config_line = lineno;
- strfieldcpy(dev.config_file, filename);
+ strlcpy(dev.config_file, filename, sizeof(dev.config_file));
retval = add_config_dev(&dev);
if (retval) {
dbg("add_config_dev returned with error %d", retval);
continue;
error:
info("parse error %s, line %d:%d, rule skipped",
- filename, lineno, temp - line);
+ filename, lineno, (int) (temp - line));
}
}
return -1;
if ((stats.st_mode & S_IFMT) != S_IFDIR)
- retval = namedev_parse(udev_rules_filename, NULL);
+ retval = namedev_parse(NULL, udev_rules_filename);
else
- retval = call_foreach_file(namedev_parse, udev_rules_filename, RULEFILE_SUFFIX, NULL);
+ retval = call_foreach_file(namedev_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
return retval;
}
void namedev_close(void)
{
struct config_device *dev;
+ struct config_device *temp_dev;
- list_for_each_entry(dev, &config_device_list, node) {
+ list_for_each_entry_safe(dev, temp_dev, &config_device_list, node) {
list_del(&dev->node);
free(dev);
}
~ianmdlvl / elogind.git / blobdiff