void udev_event_unref(struct udev_event *event)
{
+ if (event == NULL)
+ return;
udev_list_cleanup_entries(event->udev, &event->run_list);
+ free(event->tmp_node);
+ free(event->program_result);
+ free(event->name);
dbg(event->udev, "free event %p\n", event);
free(event);
}
dbg(event->udev, "substitute minor number '%s'\n", temp2);
break;
case SUBST_RESULT:
- if (event->program_result[0] == '\0')
+ if (event->program_result == NULL)
break;
/* get part part of the result string */
i = 0;
if (attr != NULL)
i = strtoul(attr, &rest, 10);
if (i > 0) {
+ char result[UTIL_PATH_SIZE];
+
dbg(event->udev, "request part #%d of result string\n", i);
- cpos = event->program_result;
+ util_strlcpy(result, event->program_result, sizeof(result));
+ cpos = result;
while (--i) {
while (cpos[0] != '\0' && !isspace(cpos[0]))
cpos++;
err(event->udev, "missing file parameter for attr\n");
else {
const char *val;
- char value[UTIL_NAME_SIZE] = "";
+ char value[UTIL_NAME_SIZE];
size_t size;
+ value[0] = '\0';
+ /* read the value specified by [usb/]*/
util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
- val = udev_device_get_sysattr_value(event->dev, attr);
- if (val != NULL)
- util_strlcpy(value, val, sizeof(value));
+ /* try to read attribute of the current device */
+ if (value[0] == '\0') {
+ val = udev_device_get_sysattr_value(event->dev, attr);
+ if (val != NULL)
+ util_strlcpy(value, val, sizeof(value));
+ }
- /* try the current device, other matches may have selected */
+ /* try to read the attribute of the parent device, other matches have selected */
if (value[0] == '\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
val = udev_device_get_sysattr_value(event->dev_parent, attr);
if (val != NULL)
}
break;
case SUBST_TEMP_NODE:
- if (event->tmp_node[0] == '\0' && major(udev_device_get_devnum(dev)) > 0) {
- dbg(event->udev, "create temporary device node for callout\n");
- snprintf(event->tmp_node, sizeof(event->tmp_node), "%s/.tmp-%u-%u",
- udev_get_dev_path(event->udev),
- major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
- udev_node_mknod(dev, event->tmp_node, makedev(0,0), 0600, 0, 0);
+ {
+ dev_t devnum;
+ struct stat statbuf;
+ char filename[UTIL_PATH_SIZE];
+ const char *devtype;
+
+ if (event->tmp_node != NULL) {
+ util_strlcat(string, event->tmp_node, maxsize);
+ dbg(event->udev, "return existing temporary node\n");
+ break;
+ }
+ devnum = udev_device_get_devnum(dev);
+ if (major(udev_device_get_devnum(dev) == 0))
+ break;
+ if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
+ devtype = "block";
+ else
+ devtype = "char";
+ snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+ udev_get_dev_path(event->udev), devtype,
+ major(udev_device_get_devnum(dev)),
+ minor(udev_device_get_devnum(dev)));
+ if (stat(filename, &statbuf) == 0 && statbuf.st_rdev == devnum) {
+ util_strlcat(string, filename, maxsize);
+ dbg(event->udev, "return existing temporary node\n");
+ break;
+ }
+ dbg(event->udev, "create temporary node\n");
+ asprintf(&event->tmp_node, "%s/.tmp-%s-%u:%u",
+ udev_get_dev_path(event->udev), devtype,
+ major(udev_device_get_devnum(dev)),
+ minor(udev_device_get_devnum(dev)));
+ if (event->tmp_node == NULL)
+ break;
+ udev_node_mknod(dev, event->tmp_node, makedev(0, 0), 0600, 0, 0);
+ util_strlcat(string, event->tmp_node, maxsize);
}
- util_strlcat(string, event->tmp_node, maxsize);
- dbg(event->udev, "substitute temporary device node name '%s'\n", event->tmp_node);
break;
case SUBST_NAME:
if (event->name != NULL) {
dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev));
udev_rules_apply_to_event(rules, event);
- if (event->tmp_node[0] != '\0') {
+ if (event->tmp_node != NULL) {
dbg(event->udev, "removing temporary device node\n");
util_unlink_secure(event->udev, event->tmp_node);
- event->tmp_node[0] = '\0';
+ free(event->tmp_node);
+ event->tmp_node = NULL;
}
if (event->ignore_device) {
goto exit;
}
- if (event->name_ignore) {
+ if (event->name != NULL && event->name[0] == '\0') {
info(event->udev, "device node creation supressed\n");
goto exit;
}
- if (event->name[0] == '\0') {
+ if (event->name == NULL) {
info(event->udev, "no node name set, will use kernel name '%s'\n",
udev_device_get_sysname(event->dev));
- util_strlcpy(event->name, udev_device_get_sysname(event->dev), sizeof(event->name));
+ event->name = strdup(udev_device_get_sysname(event->dev));
+ if (event->name == NULL)
+ goto exit;
}
/* set device node name */
info(event->udev, "device event will be ignored\n");
goto exit;
}
- if (event->name[0] == '\0') {
- info(event->udev, "device renaming supressed\n");
+ if (event->name == NULL)
goto exit;
- }
/* look if we want to change the name of the netif */
if (strcmp(event->name, udev_device_get_sysname(dev)) != 0) {