summaryrefslogtreecommitdiff
path: root/udev_rules_parse.c
diff options
context:
space:
mode:
Diffstat (limited to 'udev_rules_parse.c')
-rw-r--r--udev_rules_parse.c128
1 files changed, 64 insertions, 64 deletions
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 6d88354dbd..b586df1324 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -33,7 +33,7 @@
void udev_rules_iter_init(struct udev_rules *rules)
{
- dbg("bufsize=%zi", rules->bufsize);
+ dbg("bufsize=%zi\n", rules->bufsize);
rules->current = 0;
}
@@ -44,9 +44,9 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
if (!rules)
return NULL;
- dbg("current=%zi", rules->current);
+ dbg("current=%zi\n", rules->current);
if (rules->current >= rules->bufsize) {
- dbg("no more rules");
+ dbg("no more rules\n");
return NULL;
}
@@ -62,20 +62,20 @@ struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *la
static struct udev_rule *rule;
next:
- dbg("current=%zi", rules->current);
+ dbg("current=%zi\n", rules->current);
if (rules->current >= rules->bufsize) {
- dbg("no more rules");
+ dbg("no more rules\n");
return NULL;
}
rule = (struct udev_rule *) (rules->buf + rules->current);
if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
- dbg("moving forward, looking for label '%s'", label);
+ dbg("moving forward, looking for label '%s'\n", label);
rules->current += sizeof(struct udev_rule) + rule->bufsize;
goto next;
}
- dbg("found label '%s'", label);
+ dbg("found label '%s'\n", label);
return rule;
}
@@ -123,29 +123,29 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
if (linepos[0] == '=' && linepos[1] == '=') {
*operation = KEY_OP_MATCH;
linepos += 2;
- dbg("operator=match");
+ dbg("operator=match\n");
} else if (linepos[0] == '!' && linepos[1] == '=') {
*operation = KEY_OP_NOMATCH;
linepos += 2;
- dbg("operator=nomatch");
+ dbg("operator=nomatch\n");
} else if (linepos[0] == '+' && linepos[1] == '=') {
*operation = KEY_OP_ADD;
linepos += 2;
- dbg("operator=add");
+ dbg("operator=add\n");
} else if (linepos[0] == '=') {
*operation = KEY_OP_ASSIGN;
linepos++;
- dbg("operator=assign");
+ dbg("operator=assign\n");
} else if (linepos[0] == ':' && linepos[1] == '=') {
*operation = KEY_OP_ASSIGN_FINAL;
linepos += 2;
- dbg("operator=assign_final");
+ dbg("operator=assign_final\n");
} else
return -1;
/* terminate key */
temp[0] = '\0';
- dbg("key='%s'", *key);
+ dbg("key='%s'\n", *key);
/* skip whitespace after operator */
while (isspace(linepos[0]))
@@ -165,7 +165,7 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
return -1;
temp[0] = '\0';
temp++;
- dbg("value='%s'", *value);
+ dbg("value='%s'\n", *value);
/* move line to next key */
*line = temp;
@@ -184,11 +184,11 @@ static char *get_key_attribute(char *str)
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
- err("missing closing brace for format");
+ err("missing closing brace for format\n");
return NULL;
}
pos[0] = '\0';
- dbg("attribute='%s'", attr);
+ dbg("attribute='%s'\n", attr);
return attr;
}
@@ -215,7 +215,7 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
size_t key_len = strnlen(key, PATH_SIZE);
if (pairs->count >= PAIRS_MAX) {
- err("skip, too many keys of the same type in a single rule");
+ err("skip, too many keys of the same type in a single rule\n");
return -1;
}
@@ -261,7 +261,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "ACTION") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid ACTION operation");
+ err("invalid ACTION operation\n");
goto invalid;
}
add_rule_key(rule, &rule->action, operation, value);
@@ -272,7 +272,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "DEVPATH") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid DEVPATH operation");
+ err("invalid DEVPATH operation\n");
goto invalid;
}
add_rule_key(rule, &rule->devpath, operation, value);
@@ -283,7 +283,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "KERNEL") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid KERNEL operation");
+ err("invalid KERNEL operation\n");
goto invalid;
}
add_rule_key(rule, &rule->kernel, operation, value);
@@ -294,7 +294,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "SUBSYSTEM") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid SUBSYSTEM operation");
+ err("invalid SUBSYSTEM operation\n");
goto invalid;
}
/* bus, class, subsystem events should all be the same */
@@ -302,7 +302,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
strcmp(value, "bus") == 0 ||
strcmp(value, "class") == 0) {
if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
- err("'%s' must be specified as 'subsystem' "
+ err("'%s' must be specified as 'subsystem' \n"
"please fix it in %s:%u", value, filename, lineno);
add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
} else
@@ -314,7 +314,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "DRIVER") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid DRIVER operation");
+ err("invalid DRIVER operation\n");
goto invalid;
}
add_rule_key(rule, &rule->driver, operation, value);
@@ -325,7 +325,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
attr = get_key_attribute(key + sizeof("ATTR")-1);
if (attr == NULL) {
- err("error parsing ATTR attribute");
+ err("error parsing ATTR attribute\n");
goto invalid;
}
if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
@@ -338,7 +338,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
strcasecmp(key, "ID") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid KERNELS operation");
+ err("invalid KERNELS operation\n");
goto invalid;
}
add_rule_key(rule, &rule->kernels, operation, value);
@@ -350,7 +350,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
strcasecmp(key, "BUS") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid SUBSYSTEMS operation");
+ err("invalid SUBSYSTEMS operation\n");
goto invalid;
}
add_rule_key(rule, &rule->subsystems, operation, value);
@@ -361,7 +361,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "DRIVERS") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid DRIVERS operation");
+ err("invalid DRIVERS operation\n");
goto invalid;
}
add_rule_key(rule, &rule->drivers, operation, value);
@@ -373,19 +373,19 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid ATTRS operation");
+ err("invalid ATTRS operation\n");
goto invalid;
}
attr = get_key_attribute(key + sizeof("ATTRS")-1);
if (attr == NULL) {
- err("error parsing ATTRS attribute");
+ err("error parsing ATTRS attribute\n");
goto invalid;
}
if (strncmp(attr, "device/", 7) == 0)
- err("the 'device' link is deprecated and will be removed from a future kernel, "
+ err("the 'device' link is deprecated and will be removed from a future kernel, \n"
"please fix it in %s:%u", filename, lineno);
else if (strstr(attr, "../") != NULL)
- err("do not reference parent sysfs directories directly, that may break with a future kernel, "
+ err("do not reference parent sysfs directories directly, that may break with a future kernel, \n"
"please fix it in %s:%u", filename, lineno);
if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
goto invalid;
@@ -396,7 +396,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
attr = get_key_attribute(key + sizeof("ENV")-1);
if (attr == NULL) {
- err("error parsing ENV attribute");
+ err("error parsing ENV attribute\n");
goto invalid;
}
if (strncmp(attr, "PHYSDEV", 7) == 0)
@@ -416,7 +416,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strcasecmp(key, "RESULT") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid RESULT operation");
+ err("invalid RESULT operation\n");
goto invalid;
}
add_rule_key(rule, &rule->result, operation, value);
@@ -427,13 +427,13 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
attr = get_key_attribute(key + sizeof("IMPORT")-1);
if (attr != NULL && strstr(attr, "program")) {
- dbg("IMPORT will be executed");
+ dbg("IMPORT will be executed\n");
rule->import_type = IMPORT_PROGRAM;
} else if (attr != NULL && strstr(attr, "file")) {
- dbg("IMPORT will be included as file");
+ dbg("IMPORT will be included as file\n");
rule->import_type = IMPORT_FILE;
} else if (attr != NULL && strstr(attr, "parent")) {
- dbg("IMPORT will include the parent values");
+ dbg("IMPORT will include the parent values\n");
rule->import_type = IMPORT_PARENT;
} else {
/* figure it out if it is executable */
@@ -455,12 +455,12 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
pos[0] = '\0';
}
- dbg("IMPORT auto mode for '%s'", file);
+ dbg("IMPORT auto mode for '%s'\n", file);
if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
- dbg("IMPORT is executable, will be executed (autotype)");
+ dbg("IMPORT is executable, will be executed (autotype)\n");
rule->import_type = IMPORT_PROGRAM;
} else {
- dbg("IMPORT is not executable, will be included as file (autotype)");
+ dbg("IMPORT is not executable, will be included as file (autotype)\n");
rule->import_type = IMPORT_FILE;
}
}
@@ -472,7 +472,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid TEST operation");
+ err("invalid TEST operation\n");
goto invalid;
}
attr = get_key_attribute(key + sizeof("TEST")-1);
@@ -516,16 +516,16 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
attr = get_key_attribute(key + sizeof("NAME")-1);
if (attr != NULL) {
if (strstr(attr, "all_partitions") != NULL) {
- dbg("creation of partition nodes requested");
+ dbg("creation of partition nodes requested\n");
rule->partitions = DEFAULT_PARTITIONS_COUNT;
}
if (strstr(attr, "ignore_remove") != NULL) {
- dbg("remove event should be ignored");
+ dbg("remove event should be ignored\n");
rule->ignore_remove = 1;
}
}
if (value[0] == '\0')
- dbg("name empty, node creation supressed");
+ dbg("name empty, node creation supressed\n");
add_rule_key(rule, &rule->name, operation, value);
continue;
}
@@ -548,7 +548,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (endptr[0] != '\0') {
char owner[32];
uid_t uid = lookup_user(value);
- dbg("replacing username='%s' by id=%i", value, uid);
+ dbg("replacing username='%s' by id=%i\n", value, uid);
sprintf(owner, "%u", (unsigned int) uid);
add_rule_key(rule, &rule->owner, operation, owner);
continue;
@@ -567,7 +567,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
if (endptr[0] != '\0') {
char group[32];
gid_t gid = lookup_group(value);
- dbg("replacing groupname='%s' by id=%i", value, gid);
+ dbg("replacing groupname='%s' by id=%i\n", value, gid);
sprintf(group, "%u", (unsigned int) gid);
add_rule_key(rule, &rule->group, operation, group);
continue;
@@ -588,21 +588,21 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
const char *pos;
if (strstr(value, "last_rule") != NULL) {
- dbg("last rule to be applied");
+ dbg("last rule to be applied\n");
rule->last_rule = 1;
}
if (strstr(value, "ignore_device") != NULL) {
- dbg("device should be ignored");
+ dbg("device should be ignored\n");
rule->ignore_device = 1;
}
if (strstr(value, "ignore_remove") != NULL) {
- dbg("remove event should be ignored");
+ dbg("remove event should be ignored\n");
rule->ignore_remove = 1;
}
pos = strstr(value, "link_priority=");
if (pos != NULL) {
rule->link_priority = atoi(&pos[strlen("link_priority=")]);
- dbg("link priority=%i", rule->link_priority);
+ dbg("link priority=%i\n", rule->link_priority);
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
@@ -613,18 +613,18 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
rule->string_escape = ESCAPE_REPLACE;
}
if (strstr(value, "all_partitions") != NULL) {
- dbg("creation of partition nodes requested");
+ dbg("creation of partition nodes requested\n");
rule->partitions = DEFAULT_PARTITIONS_COUNT;
}
valid = 1;
continue;
}
- err("unknown key '%s' in %s:%u", key, filename, lineno);
+ err("unknown key '%s' in %s:%u\n", key, filename, lineno);
}
if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
- err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
+ err("PHYSDEV* values are deprecated and will be removed from a future kernel, \n"
"please fix it in %s:%u", filename, lineno);
/* skip line if not any valid key was found */
@@ -634,23 +634,23 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
/* grow buffer and add rule */
rule_size = sizeof(struct udev_rule) + rule->bufsize;
padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
- dbg("add %zi padding bytes", padding);
+ dbg("add %zi padding bytes\n", padding);
rule_size += padding;
rule->bufsize += padding;
rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
if (!rules->buf) {
- err("realloc failed");
+ err("realloc failed\n");
goto exit;
}
- dbg("adding rule to offset %zi", rules->bufsize);
+ dbg("adding rule to offset %zi\n", rules->bufsize);
memcpy(rules->buf + rules->bufsize, rule, rule_size);
rules->bufsize += rule_size;
exit:
return 0;
invalid:
- err("invalid rule '%s:%u'", filename, lineno);
+ err("invalid rule '%s:%u'\n", filename, lineno);
return -1;
}
@@ -666,10 +666,10 @@ static int parse_file(struct udev_rules *rules, const char *filename)
int retval = 0;
if (file_map(filename, &buf, &bufsize) != 0) {
- err("can't open '%s' as rules file: %s", filename, strerror(errno));
+ err("can't open '%s' as rules file: %s\n", filename, strerror(errno));
return -1;
}
- info("reading '%s' as rules file", filename);
+ info("reading '%s' as rules file\n", filename);
/* loop through the whole file */
cur = 0;
@@ -695,7 +695,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
continue;
if (count >= sizeof(line)) {
- err("line too long, rule skipped '%s:%u'", filename, lineno);
+ err("line too long, rule skipped '%s:%u'\n", filename, lineno);
continue;
}
@@ -708,7 +708,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
}
line[j] = '\0';
- dbg("read '%s'", line);
+ dbg("read '%s'\n", line);
add_to_rules(rules, line, filename, lineno);
}
@@ -733,10 +733,10 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
if (stat(udev_rules_dir, &statbuf) != 0)
return -1;
if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
- dbg("parse single rules file '%s'", udev_rules_dir);
+ dbg("parse single rules file '%s'\n", udev_rules_dir);
name_list_add(&name_list, udev_rules_dir, 1);
} else {
- dbg("parse rules directory '%s'", udev_rules_dir);
+ dbg("parse rules directory '%s'\n", udev_rules_dir);
retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
}
@@ -776,9 +776,9 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
if (statbuf.st_size)
parse_file(rules, name_loop->name);
else
- dbg("empty rules file '%s'", name_loop->name);
+ dbg("empty rules file '%s'\n", name_loop->name);
} else
- err("could not read '%s': %s", name_loop->name, strerror(errno));
+ err("could not read '%s': %s\n", name_loop->name, strerror(errno));
list_del(&name_loop->node);
free(name_loop);
}