*
*/
+/* define this to enable parsing debugging */
+#define DEBUG_PARSER
+
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <unistd.h>
#include <errno.h>
+#include <sys/wait.h>
#include "list.h"
#include "udev.h"
#define TYPE_NUMBER "NUMBER"
#define TYPE_TOPOLOGY "TOPOLOGY"
#define TYPE_REPLACE "REPLACE"
+#define TYPE_CALLOUT "CALLOUT"
static LIST_HEAD(config_device_list);
{
switch (dev->type) {
case KERNEL_NAME:
- dbg("KERNEL name ='%s'"
+ dbg_parse("KERNEL name ='%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name,
+ dev->owner, dev->group, dev->mode);
break;
case LABEL:
- dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
+ dbg_parse("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+ dev->owner, dev->group, dev->mode);
break;
case NUMBER:
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
+ dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->id,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->bus, dev->id,
+ dev->owner, dev->group, dev->mode);
break;
case TOPOLOGY:
- dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
+ dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->place,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->bus, dev->place,
+ dev->owner, dev->group, dev->mode);
break;
case REPLACE:
- dbg("REPLACE name = %s, kernel_name = %s"
+ dbg_parse("REPLACE name = %s, kernel_name = %s"
+ " owner = '%s', group = '%s', mode = '%#o'",
+ dev->name, dev->kernel_name,
+ dev->owner, dev->group, dev->mode);
+ break;
+ case CALLOUT:
+ dbg_parse("CALLOUT name = '%s', program ='%s', bus = '%s', id = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->kernel_name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->exec_program, dev->bus, dev->id,
+ dev->owner, dev->group, dev->mode);
break;
default:
- dbg("Unknown type of device!");
+ dbg_parse("Unknown type of device!");
}
}
* this one... */
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
- if (strcmp(dev->attr.name, new_dev->attr.name) == 0) {
+ if (strcmp(dev->name, new_dev->name) == 0) {
/* the same, copy the new info into this structure */
copy_var(dev, new_dev, type);
- copy_var(dev, new_dev, attr.mode);
+ copy_var(dev, new_dev, mode);
copy_string(dev, new_dev, bus);
copy_string(dev, new_dev, sysfs_file);
copy_string(dev, new_dev, sysfs_value);
copy_string(dev, new_dev, id);
copy_string(dev, new_dev, place);
copy_string(dev, new_dev, kernel_name);
- copy_string(dev, new_dev, attr.owner);
- copy_string(dev, new_dev, attr.group);
+ copy_string(dev, new_dev, owner);
+ copy_string(dev, new_dev, group);
return 0;
}
}
static int namedev_init_config(void)
{
- char filename[255];
char line[255];
char *temp;
char *temp2;
int retval = 0;
struct config_device dev;
- strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_FILE);
- dbg("opening %s to read as permissions config", filename);
- fd = fopen(filename, "r");
+ dbg("opening %s to read as config", udev_config_filename);
+ fd = fopen(udev_config_filename, "r");
if (fd == NULL) {
- dbg("Can't open %s", filename);
+ dbg("Can't open %s", udev_config_filename);
return -ENODEV;
}
if (temp == NULL)
break;
- dbg("read %s", temp);
+ dbg_parse("read %s", temp);
/* eat the whitespace at the beginning of the line */
while (isspace(*temp))
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
+ strcpy(dev.name, temp3);
- dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'", dev.attr.name, dev.bus, dev.sysfs_file, dev.sysfs_value);
+ dbg_parse("LABEL name = '%s', bus = '%s', "
+ "sysfs_file = '%s', sysfs_value = '%s'",
+ dev.name, dev.bus, dev.sysfs_file,
+ dev.sysfs_value);
}
if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
+ strcpy(dev.name, temp3);
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'", dev.attr.name, dev.bus, dev.id);
+ dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
+ dev.name, dev.bus, dev.id);
}
if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
+ strcpy(dev.name, temp3);
- dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'", dev.attr.name, dev.bus, dev.place);
+ dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
+ dev.name, dev.bus, dev.place);
}
if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
- dbg("REPLACE name = %s, kernel_name = %s", dev.attr.name, dev.kernel_name);
+ strcpy(dev.name, temp3);
+ dbg_parse("REPLACE name = %s, kernel_name = %s",
+ dev.name, dev.kernel_name);
+ }
+ if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
+ /* number type */
+ dev.type = CALLOUT;
+
+ /* PROGRAM="executable" */
+ retval = get_value("PROGRAM", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.exec_program, temp3);
+
+ /* BUS="bus" */
+ temp2 = strsep(&temp, ",");
+ retval = get_value("BUS", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.bus, temp3);
+
+ /* ID="id" */
+ temp2 = strsep(&temp, ",");
+ retval = get_value("ID", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.id, temp3);
+
+ /* NAME="new_name" */
+ temp2 = strsep(&temp, ",");
+ retval = get_value("NAME", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.name, temp3);
+ dbg_parse("CALLOUT name = %s, program = %s",
+ dev.name, dev.exec_program);
}
retval = add_dev(&dev);
static int namedev_init_permissions(void)
{
- char filename[255];
char line[255];
char *temp;
char *temp2;
int retval = 0;
struct config_device dev;
- strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_PERMISSION_FILE);
- dbg("opening %s to read as permissions config", filename);
- fd = fopen(filename, "r");
+ dbg("opening %s to read as permissions config", udev_config_permission_filename);
+ fd = fopen(udev_config_permission_filename, "r");
if (fd == NULL) {
- dbg("Can't open %s", filename);
+ dbg("Can't open %s", udev_config_permission_filename);
return -ENODEV;
}
if (temp == NULL)
break;
- dbg("read %s", temp);
+ dbg_parse("read %s", temp);
/* eat the whitespace at the beginning of the line */
while (isspace(*temp))
/* parse the line */
temp2 = strsep(&temp, ":");
- strncpy(dev.attr.name, temp2, sizeof(dev.attr.name));
+ strncpy(dev.name, temp2, sizeof(dev.name));
temp2 = strsep(&temp, ":");
- strncpy(dev.attr.owner, temp2, sizeof(dev.attr.owner));
+ strncpy(dev.owner, temp2, sizeof(dev.owner));
temp2 = strsep(&temp, ":");
- strncpy(dev.attr.group, temp2, sizeof(dev.attr.owner));
+ strncpy(dev.group, temp2, sizeof(dev.owner));
- dev.attr.mode = strtol(temp, NULL, 8);
+ dev.mode = strtol(temp, NULL, 8);
- dbg("name = %s, owner = %s, group = %s, mode = %#o", dev.attr.name, dev.attr.owner, dev.attr.group, dev.attr.mode);
+ dbg_parse("name = %s, owner = %s, group = %s, mode = %#o",
+ dev.name, dev.owner, dev.group,
+ dev.mode);
retval = add_dev(&dev);
if (retval) {
dbg("add_dev returned with error %d", retval);
return retval;
}
-static int get_default_mode(struct sysfs_class_device *class_dev)
+static mode_t get_default_mode(struct sysfs_class_device *class_dev)
{
/* just default everyone to rw for the world! */
return 0666;
}
-static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+static int exec_callout(struct config_device *dev, char *value, int len)
+{
+ int retval;
+ int res;
+ int status;
+ int fds[2];
+ pid_t pid;
+ int value_set = 0;
+ char buffer[256];
+
+ dbg("callout to %s\n", dev->exec_program);
+ retval = pipe(fds);
+ if (retval != 0) {
+ dbg("pipe failed");
+ return -1;
+ }
+ pid = fork();
+ if (pid == -1) {
+ dbg("fork failed");
+ return -1;
+ }
+
+ if (pid == 0) {
+ /*
+ * child
+ */
+ close(STDOUT_FILENO);
+ dup(fds[1]); /* dup write side of pipe to STDOUT */
+ retval = execve(dev->exec_program, main_argv, main_envp);
+ if (retval != 0) {
+ dbg("child execve failed");
+ exit(1);
+ }
+ return -1; /* avoid compiler warning */
+ } else {
+ /*
+ * Parent reads from fds[0].
+ */
+ close(fds[1]);
+ retval = 0;
+ while (1) {
+ res = read(fds[0], buffer, sizeof(buffer) - 1);
+ if (res <= 0)
+ break;
+ buffer[res] = '\0';
+ if (res > len) {
+ dbg("callout len %d too short\n", len);
+ retval = -1;
+ }
+ if (value_set) {
+ dbg("callout value already set");
+ retval = -1;
+ } else {
+ value_set = 1;
+ strncpy(value, buffer, len);
+ }
+ }
+ close(fds[0]);
+ res = wait(&status);
+ if (res < 0) {
+ dbg("wait failed result %d", res);
+ retval = -1;
+ }
+
+ if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+ dbg("callout program status 0x%x", status);
+ retval = -1;
+ }
+ }
+ return retval;
+}
+
+static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
{
struct list_head *tmp;
int retval = 0;
int found;
- attr->mode = -1;
+ udev->mode = 0;
if (class_dev->sysdevice) {
- dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
- dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
+ dbg_parse("class_dev->sysdevice->path = '%s'", class_dev->sysdevice->path);
+ dbg_parse("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
} else {
- dbg("class_dev->name = '%s'", class_dev->name);
+ dbg_parse("class_dev->name = '%s'", class_dev->name);
}
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
switch (dev->type) {
case LABEL:
{
- char *temp;
+ struct sysfs_attribute *tmpattr = NULL;
+ struct sysfs_class_device *class_dev_parent = NULL;
+ char *temp = NULL;
- dbg("LABEL: match file '%s' with value '%s'", dev->sysfs_file, dev->sysfs_value);
+ dbg_parse("LABEL: match file '%s' with value '%s'",
+ dev->sysfs_file, dev->sysfs_value);
/* try to find the attribute in the class device directory */
- temp = sysfs_get_value_from_attributes(class_dev->directory->attributes, dev->sysfs_file);
- if (temp)
+ tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+ if (tmpattr)
goto label_found;
- /* look in the class device device directory if present */
+ /* look in the class device directory if present */
if (class_dev->sysdevice) {
- temp = sysfs_get_value_from_attributes(class_dev->sysdevice->directory->attributes, dev->sysfs_file);
- if (temp)
+ tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
+ if (tmpattr)
goto label_found;
}
* as block partitions don't point to the physical device. Need to fix that
* up in the kernel...
*/
- if (strstr(class_dev->directory->path, "block")) {
- dbg("looking at block device...");
- if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
+ if (strstr(class_dev->path, "block")) {
+ dbg_parse("looking at block device...");
+ if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
char path[SYSFS_PATH_MAX];
- struct sysfs_class_device *class_dev_parent;
- dbg("really is a partition...");
- strcpy(path, class_dev->directory->path);
+ dbg_parse("really is a partition...");
+ strcpy(path, class_dev->path);
temp = strrchr(path, '/');
*temp = 0x00;
- dbg("looking for a class device at '%s'", path);
+ dbg_parse("looking for a class device at '%s'", path);
class_dev_parent = sysfs_open_class_device(path);
if (class_dev_parent == NULL) {
- dbg ("sysfs_open_class_device failed");
+ dbg("sysfs_open_class_device at '%s' failed", path);
continue;
}
- dbg("class_dev_parent->name = %s", class_dev_parent->name);
+ dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
/* try to find the attribute in the class device directory */
- temp = sysfs_get_value_from_attributes(class_dev_parent->directory->attributes, dev->sysfs_file);
- if (temp) {
- //sysfs_close_class_device(class_dev_parent);
+ tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
+ if (tmpattr)
goto label_found;
- }
- /* look in the class device device directory if present */
+ /* look in the class device directory if present */
if (class_dev_parent->sysdevice) {
- temp = sysfs_get_value_from_attributes(class_dev_parent->sysdevice->directory->attributes, dev->sysfs_file);
- if (temp) {
- // sysfs_close_class_device(class_dev_parent);
+ tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
+ if (tmpattr)
goto label_found;
- }
}
}
}
+ if (class_dev_parent)
+ sysfs_close_class_device(class_dev_parent);
+
continue;
label_found:
- temp[strlen(temp)-1] = 0x00;
- dbg("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, temp, dev->sysfs_value);
- if (strcmp(dev->sysfs_value, temp) != 0)
+ tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+ dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
+ if (strcmp(dev->sysfs_value, tmpattr->value) != 0) {
+ if (class_dev_parent)
+ sysfs_close_class_device(class_dev_parent);
continue;
+ }
- strcpy(attr->name, dev->attr.name);
- if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
- temp[0] = class_dev->directory->path[strlen(class_dev->directory->path)-1];
- temp[1] = 0x00;
- strcat(attr->name, temp);
+ strcpy(udev->name, dev->name);
+ if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+ temp = &class_dev->path[strlen(class_dev->path)-1];
+ strcat(udev->name, temp);
}
- if (dev->attr.mode != 0) {
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
}
- dbg("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->sysfs_file, dev->sysfs_value, attr->name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->sysfs_file, dev->sysfs_value, udev->name,
+ dev->owner, dev->group, dev->mode);
+ if (class_dev_parent)
+ sysfs_close_class_device(class_dev_parent);
goto done;
break;
}
found = 0;
if (!class_dev->sysdevice)
continue;
- strcpy(path, class_dev->sysdevice->directory->path);
+ strcpy(path, class_dev->sysdevice->path);
temp = strrchr(path, '/');
- dbg("NUMBER path = '%s'", path);
- dbg("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ dbg_parse("NUMBER path = '%s'", path);
+ dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
if (strstr(temp, dev->id) != NULL) {
found = 1;
} else {
*temp = 0x00;
temp = strrchr(path, '/');
- dbg("TOPOLOGY temp = '%s' id = '%s'", temp, dev->id);
+ dbg_parse("NUMBERY temp = '%s' id = '%s'", temp, dev->id);
if (strstr(temp, dev->id) != NULL)
found = 1;
}
if (!found)
continue;
- strcpy(attr->name, dev->attr.name);
- if (dev->attr.mode != 0) {
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
}
- dbg("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->id, attr->name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, udev->name,
+ dev->owner, dev->group, dev->mode);
goto done;
break;
}
if (!class_dev->sysdevice)
continue;
found = 0;
- strcpy(path, class_dev->sysdevice->directory->path);
+ strcpy(path, class_dev->sysdevice->path);
temp = strrchr(path, '/');
- dbg("TOPOLOGY path = '%s'", path);
- dbg("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+ dbg_parse("TOPOLOGY path = '%s'", path);
+ dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
if (strstr(temp, dev->place) != NULL) {
found = 1;
} else {
*temp = 0x00;
temp = strrchr(path, '/');
- dbg("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+ dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
if (strstr(temp, dev->place) != NULL)
found = 1;
}
if (!found)
continue;
- strcpy(attr->name, dev->attr.name);
- if (dev->attr.mode != 0) {
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->place, udev->name,
+ dev->owner, dev->group, dev->mode);
+ goto done;
+ break;
+ }
+ case CALLOUT:
+ {
+ char value[ID_SIZE];
+
+ if (exec_callout(dev, value, sizeof(value)))
+ continue;
+ if (strncmp(value, dev->id, sizeof(value)) != 0)
+ continue;
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
}
- dbg("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->place, attr->name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, udev->name,
+ dev->owner, dev->group, dev->mode);
goto done;
break;
}
case REPLACE:
if (strcmp(dev->kernel_name, class_dev->name) != 0)
continue;
- strcpy(attr->name, dev->attr.name);
- if (dev->attr.mode != 0) {
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
}
- dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->kernel_name, attr->name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->kernel_name, udev->name,
+ dev->owner, dev->group, dev->mode);
goto done;
break;
case KERNEL_NAME:
break;
default:
- dbg("Unknown type of device '%d'", dev->type);
+ dbg_parse("Unknown type of device '%d'", dev->type);
break;
}
}
- strcpy(attr->name, class_dev->name);
-
+ strcpy(udev->name, class_dev->name);
+
done:
- if (attr->mode == -1) {
- attr->mode = get_default_mode(class_dev);
- attr->owner[0] = 0x00;
- attr->group[0] = 0x00;
+ /* mode was never set above */
+ if (!udev->mode) {
+ udev->mode = get_default_mode(class_dev);
+ udev->owner[0] = 0x00;
+ udev->group[0] = 0x00;
}
return retval;
}
-int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
{
int retval;
- retval = get_attr(class_dev, attr);
+ retval = get_attr(class_dev, dev);
if (retval)
dbg("get_attr failed");
~ianmdlvl / elogind.git / blobdiff