chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fedora udev.rules update
[elogind.git]
/
udev_rules_parse.c
diff --git
a/udev_rules_parse.c
b/udev_rules_parse.c
index 55412dba3c5a8e7e717236ffff1f0b8e321b300f..e665957b81c652ac007d18871c3caaadf2c240a2 100644
(file)
--- a/
udev_rules_parse.c
+++ b/
udev_rules_parse.c
@@
-157,7
+157,7
@@
static char *get_key_attribute(char *str)
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
-
dbg
("missing closing brace for format");
+
err
("missing closing brace for format");
return NULL;
}
pos[0] = '\0';
return NULL;
}
pos[0] = '\0';
@@
-185,7
+185,7
@@
static int rules_parse(const char *filename)
struct udev_rule rule;
if (file_map(filename, &buf, &bufsize) != 0) {
struct udev_rule rule;
if (file_map(filename, &buf, &bufsize) != 0) {
-
dbg
("can't open '%s' as rules file", filename);
+
err
("can't open '%s' as rules file", filename);
return -1;
}
dbg("reading '%s' as rules file", filename);
return -1;
}
dbg("reading '%s' as rules file", filename);
@@
-236,7
+236,7
@@
static int rules_parse(const char *filename)
while (1) {
char *key;
char *value;
while (1) {
char *key;
char *value;
- enum key_operation operation = KEY_OP_UN
KNOWN
;
+ enum key_operation operation = KEY_OP_UN
SET
;
retval = get_key(&linepos, &key, &operation, &value);
if (retval)
retval = get_key(&linepos, &key, &operation, &value);
if (retval)
@@
-256,6
+256,13
@@
static int rules_parse(const char *filename)
continue;
}
continue;
}
+ if (strcasecmp(key, KEY_ACTION) == 0) {
+ strlcpy(rule.action, value, sizeof(rule.action));
+ rule.action_operation = operation;
+ valid = 1;
+ continue;
+ }
+
if (strcasecmp(key, KEY_BUS) == 0) {
strlcpy(rule.bus, value, sizeof(rule.bus));
rule.bus_operation = operation;
if (strcasecmp(key, KEY_BUS) == 0) {
strlcpy(rule.bus, value, sizeof(rule.bus));
rule.bus_operation = operation;
@@
-274,13
+281,13
@@
static int rules_parse(const char *filename)
struct key_pair *pair;
if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
struct key_pair *pair;
if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
-
dbg
("skip rule, to many " KEY_SYSFS " keys in a single rule");
+
err
("skip rule, to many " KEY_SYSFS " keys in a single rule");
goto error;
}
pair = &rule.sysfs_pair[rule.sysfs_pair_count];
attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
if (attr == NULL) {
goto error;
}
pair = &rule.sysfs_pair[rule.sysfs_pair_count];
attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
if (attr == NULL) {
-
dbg
("error parsing " KEY_SYSFS " attribute");
+
err
("error parsing " KEY_SYSFS " attribute");
goto error;
}
strlcpy(pair->name, attr, sizeof(pair->name));
goto error;
}
strlcpy(pair->name, attr, sizeof(pair->name));
@@
-295,13
+302,13
@@
static int rules_parse(const char *filename)
struct key_pair *pair;
if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
struct key_pair *pair;
if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
-
dbg
("skip rule, to many " KEY_ENV " keys in a single rule");
+
err
("skip rule, to many " KEY_ENV " keys in a single rule");
goto error;
}
pair = &rule.env_pair[rule.env_pair_count];
attr = get_key_attribute(key + sizeof(KEY_ENV)-1);
if (attr == NULL) {
goto error;
}
pair = &rule.env_pair[rule.env_pair_count];
attr = get_key_attribute(key + sizeof(KEY_ENV)-1);
if (attr == NULL) {
-
dbg
("error parsing " KEY_ENV " attribute");
+
err
("error parsing " KEY_ENV " attribute");
continue;
}
strlcpy(pair->name, attr, sizeof(pair->name));
continue;
}
strlcpy(pair->name, attr, sizeof(pair->name));
@@
-379,6
+386,12
@@
static int rules_parse(const char *filename)
continue;
}
continue;
}
+ if (strcasecmp(key, KEY_RUN) == 0) {
+ strlcpy(rule.run, value, sizeof(rule.run));
+ valid = 1;
+ continue;
+ }
+
if (strcasecmp(key, KEY_OPTIONS) == 0) {
if (strstr(value, OPTION_LAST_RULE) != NULL) {
dbg("last rule to be applied");
if (strcasecmp(key, KEY_OPTIONS) == 0) {
if (strstr(value, OPTION_LAST_RULE) != NULL) {
dbg("last rule to be applied");
@@
-400,7
+413,7
@@
static int rules_parse(const char *filename)
continue;
}
continue;
}
-
dbg
("unknown key '%s'", key);
+
err
("unknown key '%s'", key);
goto error;
}
goto error;
}
@@
-408,16
+421,8
@@
static int rules_parse(const char *filename)
if (!valid)
goto error;
if (!valid)
goto error;
- /* simple plausibility checks for given keys */
- if ((rule.sysfs_pair[0].name[0] == '\0') ^
- (rule.sysfs_pair[0].value[0] == '\0')) {
- info("inconsistency in " KEY_SYSFS " key");
- goto error;
- }
-
if ((rule.result[0] != '\0') && (program_given == 0)) {
if ((rule.result[0] != '\0') && (program_given == 0)) {
- info(KEY_RESULT " is only useful when "
- KEY_PROGRAM " is called in any rule before");
+ info(KEY_RESULT " is only useful when " KEY_PROGRAM " is called in any rule before");
goto error;
}
goto error;
}
@@
-428,7
+433,7
@@
static int rules_parse(const char *filename)
dbg("add_config_dev returned with error %d", retval);
continue;
error:
dbg("add_config_dev returned with error %d", retval);
continue;
error:
-
info
("parse error %s, line %d:%d, rule skipped",
+
err
("parse error %s, line %d:%d, rule skipped",
filename, lineno, (int) (linepos - line));
}
}
filename, lineno, (int) (linepos - line));
}
}