char filename[PATH_SIZE];
struct udevice *udev_db;
int num = 0;
+ static int warn = 1;
+
+ if (warn) {
+ err("%%e is deprecated, will be removed and is unlikely to work correctly. Don't use it.");
+ warn = 0;
+ }
/* check if the device already owns a matching name */
udev_db = udev_device_init();
#define WAIT_LOOP_PER_SECOND 50
static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
{
- char filename[PATH_SIZE];
+ char devicepath[PATH_SIZE];
+ char filepath[PATH_SIZE];
struct stat stats;
int loop = timeout * WAIT_LOOP_PER_SECOND;
- snprintf(filename, sizeof(filename), "%s%s/%s", sysfs_path, udev->dev->devpath, file);
- filename[sizeof(filename)-1] = '\0';
- dbg("wait %i sec for '%s'", timeout, filename);
+ strlcpy(devicepath, sysfs_path, sizeof(devicepath));
+ strlcat(devicepath, udev->dev->devpath, sizeof(devicepath));
+ strlcpy(filepath, devicepath, sizeof(filepath));
+ strlcat(filepath, "/", sizeof(filepath));
+ strlcat(filepath, file, sizeof(filepath));
+ dbg("will wait %i sec for '%s'", timeout, filepath);
while (--loop) {
- if (stat(filename, &stats) == 0) {
- info("file '%s' appeared after %i loops", filename, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+ /* lookup file */
+ if (stat(filepath, &stats) == 0) {
+ info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
return 0;
}
- info("wait for %i mseconds", 1000 / WAIT_LOOP_PER_SECOND);
+ /* make sure the device does not have disappeared in the meantime */
+ if (stat(devicepath, &stats) != 0) {
+ info("device disappeared while waiting for '%s'", filepath);
+ return -2;
+ }
+ info("wait for '%s' for %i mseconds", filepath, 1000 / WAIT_LOOP_PER_SECOND);
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
- err("waiting for '%s' failed", filename);
+ err("waiting for '%s' failed", filepath);
return -1;
}
-static void apply_format(struct udevice *udev, char *string, size_t maxsize)
+void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
{
char temp[PATH_SIZE];
char temp2[PATH_SIZE];
snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
udev_root, major(udev->devt), minor(udev->devt));
udev->tmp_node[sizeof(udev->tmp_node)-1] = '\0';
- udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+ udev_node_mknod(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
}
strlcat(string, udev->tmp_node, maxsize);
dbg("substitute temporary device node name '%s'", udev->tmp_node);
case SUBST_MODALIAS:
{
const char *value;
+ static int warn = 1;
+
+ if (warn) {
+ err("$modalias is deprecated, use $env{MODALIAS} or "
+ "$sysfs{modalias} instead.");
+ warn = 0;
+ }
value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
if (value != NULL) {
char *key_value;
char *pos;
- if (key->operation == KEY_OP_UNSET)
+ if (key->operation != KEY_OP_MATCH &&
+ key->operation != KEY_OP_NOMATCH)
return 0;
strlcpy(value, rule->buf + key->val_off, sizeof(value));
if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
goto nomatch;
+ /* compare NAME against a previously assigned value */
+ if (match_key("NAME", rule, &rule->name, udev->name))
+ goto nomatch;
+
if (rule->modalias.operation != KEY_OP_UNSET) {
const char *value;
+ static int warn = 1;
+
+ if (warn) {
+ err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
+ warn = 0;
+ }
value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
if (value == NULL) {
struct key_pair *pair = &rule->env.keys[i];
/* we only check for matches, assignments will be handled later */
- if (pair->key.operation != KEY_OP_ASSIGN) {
+ if (pair->key.operation == KEY_OP_MATCH ||
+ pair->key.operation == KEY_OP_NOMATCH) {
const char *key_name = key_pair_name(rule, pair);
const char *value = getenv(key_name);
}
if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
- int match;
+ int found;
- match = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
- if (match && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
- dbg("WAIT_FOR_SYSFS is true (matching value)");
- return 0;
- }
- if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH)) {
- dbg("WAIT_FOR_SYSFS is true, (non matching value)");
- return 0;
+ found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+ if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
+ dbg("WAIT_FOR_SYSFS failed");
+ goto nomatch;
}
- dbg("WAIT_FOR_SYSFS is false");
- return -1;
}
/* walk up the chain of parent devices and find a match */
udev->dev_parent = udev->dev;
while (1) {
/* check for matching driver */
- if (rule->driver.operation != KEY_OP_UNSET) {
- if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
- goto try_parent;
- }
+ if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
+ goto try_parent;
/* check for matching subsystem/bus value */
- if (rule->bus.operation != KEY_OP_UNSET) {
- if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
- goto try_parent;
- }
+ if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
+ goto try_parent;
/* check for matching bus id (device name) */
- if (rule->id.operation != KEY_OP_UNSET) {
- if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
- goto try_parent;
- }
+ if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
+ goto try_parent;
/* check for matching sysfs pairs */
if (rule->sysfs.count) {
size_t len;
value = sysfs_attr_get_value(udev->dev_parent->devpath, key_name);
+ if (value == NULL)
+ value = sysfs_attr_get_value(udev->dev->devpath, key_name);
if (value == NULL)
goto try_parent;
strlcpy(val, value, sizeof(val));
char result[PATH_SIZE];
strlcpy(program, key_val(rule, &rule->program), sizeof(program));
- apply_format(udev, program, sizeof(program));
+ udev_rules_apply_format(udev, program, sizeof(program));
if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
dbg("PROGRAM is false");
udev->program_result[0] = '\0';
int rc = -1;
strlcpy(import, key_val(rule, &rule->import), sizeof(import));
- apply_format(udev, import, sizeof(import));
+ udev_rules_apply_format(udev, import, sizeof(import));
dbg("check for IMPORT import='%s'", import);
if (rule->import_type == IMPORT_PROGRAM) {
rc = import_program_into_env(udev, import);
if (pair->key.operation == KEY_OP_ASSIGN) {
const char *key_name = key_pair_name(rule, pair);
const char *value = key_val(rule, &pair->key);
+ char *key_value = name_list_key_add(&udev->env_list, key_name, value);
+ if (key_value == NULL)
+ break;
- name_list_key_add(&udev->env_list, key_name, value);
- setenv(key_name, value, 1);
- dbg("export ENV '%s=%s'", key_name, value);
+ udev_rules_apply_format(udev, key_value, NAME_SIZE);
+ putenv(key_value);
+ dbg("export ENV '%s'", key_value);
}
}
if (rule == NULL)
break;
- if (name_set && rule->name.operation != KEY_OP_UNSET) {
+ if (name_set &&
+ (rule->name.operation == KEY_OP_ASSIGN ||
+ rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+ rule->name.operation == KEY_OP_ADD)) {
dbg("node name already set, rule ignored");
continue;
}
if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
udev->owner_final = 1;
strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
- apply_format(udev, udev->owner, sizeof(udev->owner));
+ udev_rules_apply_format(udev, udev->owner, sizeof(udev->owner));
dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel_name);
}
if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) {
if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
udev->group_final = 1;
strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group));
- apply_format(udev, udev->group, sizeof(udev->group));
+ udev_rules_apply_format(udev, udev->group, sizeof(udev->group));
dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel_name);
}
name_list_cleanup(&udev->symlink_list);
}
strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
- apply_format(udev, temp, sizeof(temp));
+ udev_rules_apply_format(udev, temp, sizeof(temp));
count = replace_untrusted_chars(temp);
if (count)
info("%i untrusted character(s) replaced" , count);
}
/* set name, later rules with name set will be ignored */
- if (rule->name.operation != KEY_OP_UNSET) {
+ if (rule->name.operation == KEY_OP_ASSIGN ||
+ rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+ rule->name.operation == KEY_OP_ADD) {
int count;
+
name_set = 1;
strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
- apply_format(udev, udev->name, sizeof(udev->name));
+ udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
count = replace_untrusted_chars(udev->name);
if (count)
info("%i untrusted character(s) replaced", count);
}
if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
- char program[PATH_SIZE];
-
if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
udev->run_final = 1;
if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
info("reset run list");
name_list_cleanup(&udev->run_list);
}
- strlcpy(program, key_val(rule, &rule->run), sizeof(program));
- apply_format(udev, program, sizeof(program));
- dbg("add run '%s'", program);
- name_list_add(&udev->run_list, program, 0);
+ dbg("add run '%s'", key_val(rule, &rule->run));
+ name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
}
if (rule->last_rule) {
}
if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
- char program[PATH_SIZE];
-
if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
info("reset run list");
name_list_cleanup(&udev->run_list);
}
- strlcpy(program, key_val(rule, &rule->run), sizeof(program));
- apply_format(udev, program, sizeof(program));
- dbg("add run '%s'", program);
- name_list_add(&udev->run_list, program, 0);
+ dbg("add run '%s'", key_val(rule, &rule->run));
+ name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
break;
}
~ianmdlvl / elogind.git / blobdiff