chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: add AOE rule
[elogind.git]
/
udev_rules.c
diff --git
a/udev_rules.c
b/udev_rules.c
index ef352ca2bc4cef3adf24438538096254cb92d55f..5ae4aa2b7817c0f6a1f48e0480eb879a1e6676c7 100644
(file)
--- a/
udev_rules.c
+++ b/
udev_rules.c
@@
-349,11
+349,6
@@
static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
cur += count+1;
lineno++;
cur += count+1;
lineno++;
- if (count >= sizeof(line)) {
- err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
- continue;
- }
-
/* eat the whitespace */
while ((count > 0) && isspace(bufline[0])) {
bufline++;
/* eat the whitespace */
while ((count > 0) && isspace(bufline[0])) {
bufline++;
@@
-366,6
+361,11
@@
static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
if (bufline[0] == COMMENT_CHARACTER)
continue;
if (bufline[0] == COMMENT_CHARACTER)
continue;
+ if (count >= sizeof(line)) {
+ err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+ continue;
+ }
+
memcpy(line, bufline, count);
line[count] = '\0';
memcpy(line, bufline, count);
line[count] = '\0';
@@
-1040,7
+1040,7
@@
static int match_rule(struct udevice *udev, struct udev_rule *rule)
if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
int found;
if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
int found;
- found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs),
3
) == 0);
+ found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs),
10
) == 0);
if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
goto nomatch;
}
if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
goto nomatch;
}
@@
-1446,7
+1446,7
@@
int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
}
if (!name_set) {
}
if (!name_set) {
- info("no node name set, will use kernel name '%s'", udev->
name
);
+ info("no node name set, will use kernel name '%s'", udev->
dev->kernel
);
strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
}
strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
}