#include "udev_version.h"
#include "namedev.h"
#include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
#define TYPE_LABEL "LABEL"
#define TYPE_NUMBER "NUMBER"
#define TYPE_TOPOLOGY "TOPOLOGY"
#define TYPE_REPLACE "REPLACE"
#define TYPE_CALLOUT "CALLOUT"
+#define CALLOUT_MAXARG 8
static LIST_HEAD(config_device_list);
+/* s2 may end with '*' to match everything */
+static int strncmp_wildcard(char *s1, char *s2, int max)
+{
+ int len = strlen(s2);
+ if (len > max)
+ len = max;
+ if (s2[len-1] == '*')
+ len--;
+ else
+ len = max;
+ return strncmp(s1, s2, len);
+}
+
static void dump_dev(struct config_device *dev)
{
switch (dev->type) {
case KERNEL_NAME:
- dbg_parse("KERNEL name ='%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->name,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("KERNEL name='%s' ,"
+ "owner='%s', group='%s', mode=%#o",
+ dev->name, dev->owner, dev->group, dev->mode);
break;
case LABEL:
- dbg_parse("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("LABEL name='%s', bus='%s', sysfs_file='%s', sysfs_value='%s', "
+ "owner='%s', group='%s', mode=%#o",
+ dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+ dev->owner, dev->group, dev->mode);
break;
case NUMBER:
- dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->name, dev->bus, dev->id,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("NUMBER name='%s', bus='%s', id='%s', "
+ "owner='%s', group='%s', mode=%#o",
+ dev->name, dev->bus, dev->id,
+ dev->owner, dev->group, dev->mode);
break;
case TOPOLOGY:
- dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->name, dev->bus, dev->place,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s', "
+ "owner='%s', group='%s', mode=%#o",
+ dev->name, dev->bus, dev->place,
+ dev->owner, dev->group, dev->mode);
break;
case REPLACE:
- 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);
+ 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->name, dev->exec_program, dev->bus, dev->id,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("CALLOUT name='%s', bus='%s', program='%s', id='%s', "
+ "owner='%s', group='%s', mode=%#o",
+ dev->name, dev->bus, dev->exec_program, dev->id,
+ dev->owner, dev->group, dev->mode);
break;
default:
- dbg_parse("Unknown type of device!");
+ dbg_parse("unknown type of method");
}
}
/* update the values if we already have the device */
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
- int len = strlen(new_dev->name);
- if (new_dev->name[len-1] == '*') {
- len--;
- if (strncmp(dev->name, new_dev->name, len))
- continue;
- } else {
- if (strcmp(dev->name, new_dev->name))
- continue;
- }
- /* the same, copy the new info into this structure */
+ if (strncmp_wildcard(dev->name, new_dev->name, sizeof(dev->name)))
+ continue;
copy_var(dev, new_dev, type);
copy_var(dev, new_dev, mode);
copy_string(dev, new_dev, bus);
return 0;
}
- /* not found, lets create a new structure, and add it to the list */
+ /* not found, add new structure to the device list */
tmp_dev = malloc(sizeof(*tmp_dev));
if (!tmp_dev)
return -ENOMEM;
int retval = 0;
struct config_device dev;
- dbg("opening %s to read as config", udev_config_filename);
+ dbg("opening '%s' to read as config", udev_config_filename);
fd = fopen(udev_config_filename, "r");
if (fd == NULL) {
- dbg("Can't open %s", udev_config_filename);
+ dbg("can't open '%s'", udev_config_filename);
return -ENODEV;
}
goto exit;
lineno++;
- dbg_parse("read %s", temp);
+ dbg_parse("read '%s'", temp);
/* eat the whitespace at the beginning of the line */
while (isspace(*temp))
++temp;
- /* no more line? */
+ /* empty line? */
if (*temp == 0x00)
continue;
break;
strfieldcpy(dev.name, temp3);
- dbg_parse("LABEL name = '%s', bus = '%s', "
- "sysfs_file = '%s', sysfs_value = '%s'",
- dev.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) {
/* ID="id" */
temp2 = strsep(&temp, ",");
- retval = get_value("id", &temp, &temp3);
+ retval = get_value("ID", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.id, temp3);
break;
strfieldcpy(dev.name, temp3);
- dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
- dev.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) {
/* PLACE="place" */
temp2 = strsep(&temp, ",");
- retval = get_value("place", &temp, &temp3);
+ retval = get_value("PLACE", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.place, temp3);
break;
strfieldcpy(dev.name, temp3);
- dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
- dev.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) {
if (retval)
break;
strfieldcpy(dev.name, temp3);
- dbg_parse("REPLACE name = %s, kernel_name = %s",
- dev.name, dev.kernel_name);
+ 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);
+ /* BUS="bus" */
+ retval = get_value("BUS", &temp, &temp3);
if (retval)
break;
- strfieldcpy(dev.exec_program, temp3);
+ strfieldcpy(dev.bus, temp3);
- /* BUS="bus" */
+ /* PROGRAM="executable" */
temp2 = strsep(&temp, ",");
- retval = get_value("BUS", &temp, &temp3);
+ retval = get_value("PROGRAM", &temp, &temp3);
if (retval)
break;
- strfieldcpy(dev.bus, temp3);
+ strfieldcpy(dev.exec_program, temp3);
/* ID="id" */
temp2 = strsep(&temp, ",");
if (retval)
break;
strfieldcpy(dev.name, temp3);
- dbg_parse("CALLOUT name = %s, program = %s",
- dev.name, dev.exec_program);
+ dbg_parse("CALLOUT name='%s', program='%s'",
+ dev.name, dev.exec_program);
}
retval = add_dev(&dev);
goto exit;
}
}
- dbg_parse("%s:%d:%Zd: error parsing ``%s''", udev_config_filename,
+ dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
lineno, temp - line, temp);
exit:
fclose(fd);
int retval = 0;
struct config_device dev;
- dbg("opening %s to read as permissions config", udev_config_permission_filename);
+ 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", udev_config_permission_filename);
+ dbg("can't open '%s'", udev_config_permission_filename);
return -ENODEV;
}
/* loop through the whole file */
while (1) {
- /* get a line */
temp = fgets(line, sizeof(line), fd);
if (temp == NULL)
break;
- dbg_parse("read %s", temp);
+ dbg_parse("read '%s'", temp);
/* eat the whitespace at the beginning of the line */
while (isspace(*temp))
++temp;
- /* no more line? */
+ /* empty line? */
if (*temp == 0x00)
continue;
/* parse the line */
temp2 = strsep(&temp, ":");
+ if (!temp2) {
+ dbg("cannot parse line '%s'", line);
+ continue;
+ }
strncpy(dev.name, temp2, sizeof(dev.name));
temp2 = strsep(&temp, ":");
+ if (!temp2) {
+ dbg("cannot parse line '%s'", line);
+ continue;
+ }
strncpy(dev.owner, temp2, sizeof(dev.owner));
temp2 = strsep(&temp, ":");
+ if (!temp2) {
+ dbg("cannot parse line '%s'", line);
+ continue;
+ }
strncpy(dev.group, temp2, sizeof(dev.owner));
dev.mode = strtol(temp, NULL, 8);
- dbg_parse("name = %s, owner = %s, group = %s, mode = %#o",
- dev.name, dev.owner, dev.group,
- dev.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 0666;
}
+static void build_kernel_number(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+ char *dig;
+
+ /* FIXME, figure out how to handle stuff like sdaj which will not work right now. */
+ dig = class_dev->name + strlen(class_dev->name);
+ while (isdigit(*(dig-1)))
+ dig--;
+ strfieldcpy(udev->kernel_number, dig);
+ dbg("kernel_number='%s'", udev->kernel_number);
+}
+
+static void apply_format(struct udevice *udev, unsigned char *string)
+{
+ char name[NAME_SIZE];
+ char *pos;
+
+ while (1) {
+ pos = strchr(string, '%');
+
+ if (pos) {
+ strfieldcpy(name, pos+2);
+ *pos = 0x00;
+ switch (pos[1]) {
+ case 'b':
+ if (strlen(udev->bus_id) == 0)
+ break;
+ strcat(pos, udev->bus_id);
+ dbg("substitute bus_id '%s'", udev->bus_id);
+ break;
+ case 'n':
+ if (strlen(udev->kernel_number) == 0)
+ break;
+ strcat(pos, udev->kernel_number);
+ dbg("substitute kernel number '%s'", udev->kernel_number);
+ break;
+ case 'm':
+ sprintf(pos, "%u", udev->minor);
+ dbg("substitute minor number '%u'", udev->minor);
+ break;
+ case 'M':
+ sprintf(pos, "%u", udev->major);
+ dbg("substitute major number '%u'", udev->major);
+ break;
+ case 'c':
+ if (strlen(udev->callout_value) == 0)
+ break;
+ strcat(pos, udev->callout_value);
+ dbg("substitute callout output '%s'", udev->callout_value);
+ break;
+ default:
+ dbg("unknown substitution type '%%%c'", pos[1]);
+ break;
+ }
+ strcat(string, name);
+ } else
+ break;
+ }
+}
+
static int exec_callout(struct config_device *dev, char *value, int len)
{
pid_t pid;
int value_set = 0;
char buffer[256];
+ char *arg;
+ char *args[CALLOUT_MAXARG];
+ int i;
- dbg("callout to %s\n", dev->exec_program);
+ dbg("callout to '%s'", dev->exec_program);
retval = pipe(fds);
if (retval != 0) {
dbg("pipe failed");
}
if (pid == 0) {
- /*
- * child
- */
+ /* child */
close(STDOUT_FILENO);
dup(fds[1]); /* dup write side of pipe to STDOUT */
- retval = execve(dev->exec_program, main_argv, main_envp);
+ if (strchr(dev->exec_program, ' ')) {
+ /* callout with arguments */
+ arg = dev->exec_program;
+ for (i=0; i < CALLOUT_MAXARG-1; i++) {
+ args[i] = strsep(&arg, " ");
+ if (args[i] == NULL)
+ break;
+ }
+ if (args[i]) {
+ dbg("too many args - %d", i);
+ args[i] = NULL;
+ }
+ retval = execve(args[0], args, main_envp);
+ } else {
+ 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].
- */
+ /* parent reads from fds[0] */
close(fds[1]);
retval = 0;
while (1) {
break;
buffer[res] = '\0';
if (res > len) {
- dbg("callout len %d too short\n", len);
+ dbg("callout len %d too short", len);
retval = -1;
}
if (value_set) {
strncpy(value, buffer, len);
}
}
+ dbg("callout returned '%s'", value);
close(fds[0]);
res = wait(&status);
if (res < 0) {
{
struct config_device *dev;
struct list_head *tmp;
- char value[ID_SIZE];
list_for_each(tmp, &config_device_list) {
dev = list_entry(tmp, struct config_device, node);
if (dev->type != CALLOUT)
continue;
- if (exec_callout(dev, value, sizeof(value)))
+ /* substitute anything that needs to be in the program name */
+ apply_format(udev, dev->exec_program);
+ if (exec_callout(dev, udev->callout_value, NAME_SIZE))
continue;
- if (strncmp(value, dev->id, sizeof(value)) != 0)
+ if (strncmp_wildcard(udev->callout_value, dev->id, NAME_SIZE) != 0)
continue;
strfieldcpy(udev->name, dev->name);
if (dev->mode != 0) {
strfieldcpy(udev->owner, dev->owner);
strfieldcpy(udev->group, dev->group);
}
- dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->id, udev->name,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("callout returned matching value '%s', '%s' becomes '%s'"
+ " - owner='%s', group='%s', mode=%#o",
+ dev->id, class_dev->name, udev->name,
+ dev->owner, dev->group, dev->mode);
return 0;
}
return -ENODEV;
if (dev->type != LABEL)
continue;
- dbg_parse("LABEL: match file '%s' with value '%s'",
- dev->sysfs_file, dev->sysfs_value);
+ dbg_parse("look for device attribute '%s'", dev->sysfs_file);
/* try to find the attribute in the class device directory */
tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
if (tmpattr)
label_found:
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);
+ dbg_parse("compare attribute '%s' value '%s' with '%s'",
+ dev->sysfs_file, tmpattr->value, dev->sysfs_value);
if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
continue;
strfieldcpy(udev->owner, dev->owner);
strfieldcpy(udev->group, dev->group);
}
- 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);
+ dbg_parse("found matching attribute '%s', '%s' becomes '%s' "
+ "- owner='%s', group='%s', mode=%#o",
+ dev->sysfs_file, class_dev->name, udev->name,
+ dev->owner, dev->group, dev->mode);
return 0;
}
found = 0;
strfieldcpy(path, sysfs_device->path);
temp = strrchr(path, '/');
- dbg_parse("NUMBER path = '%s'", path);
- dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
if (strstr(temp, dev->id) != NULL) {
found = 1;
} else {
*temp = 0x00;
temp = strrchr(path, '/');
- dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
if (strstr(temp, dev->id) != NULL)
found = 1;
}
strfieldcpy(udev->owner, dev->owner);
strfieldcpy(udev->group, dev->group);
}
- dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->id, udev->name,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("found matching id '%s', '%s' becomes '%s'"
+ " - owner='%s', group ='%s', mode=%#o",
+ dev->id, class_dev->name, udev->name,
+ dev->owner, dev->group, dev->mode);
return 0;
}
return -ENODEV;
found = 0;
strfieldcpy(path, sysfs_device->path);
temp = strrchr(path, '/');
- dbg_parse("TOPOLOGY path = '%s'", path);
- dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+ dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
if (strstr(temp, dev->place) != NULL) {
found = 1;
} else {
*temp = 0x00;
temp = strrchr(path, '/');
- dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+ dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
if (strstr(temp, dev->place) != NULL)
found = 1;
}
strfieldcpy(udev->owner, dev->owner);
strfieldcpy(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);
-
+ dbg_parse("found matching place '%s', '%s' becomes '%s'"
+ " - owner='%s', group ='%s', mode=%#o",
+ dev->place, class_dev->name, udev->name,
+ dev->owner, dev->group, dev->mode);
return 0;
}
return -ENODEV;
if (dev->type != REPLACE)
continue;
- dbg_parse("REPLACE: replace name '%s' with '%s'",
+ dbg_parse("compare name '%s' with '%s'",
dev->kernel_name, dev->name);
if (strcmp(dev->kernel_name, class_dev->name) != 0)
continue;
strfieldcpy(udev->owner, dev->owner);
strfieldcpy(udev->group, dev->group);
}
- dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->kernel_name, udev->name,
- dev->owner, dev->group, dev->mode);
+ dbg_parse("found name, '%s' becomes '%s' - owner='%s', group='%s', mode = %#o",
+ dev->kernel_name, udev->name,
+ dev->owner, dev->group, dev->mode);
return 0;
}
{
struct config_device *dev;
struct list_head *tmp;
+ int len;
strfieldcpy(udev->name, class_dev->name);
+ /* look for permissions */
list_for_each(tmp, &config_device_list) {
dev = list_entry(tmp, struct config_device, node);
- int len = strlen(dev->name);
- if (dev->name[len-1] == '*') {
- len--;
- if (strncmp(dev->name, class_dev->name, len))
- continue;
- } else {
- if (strcmp(dev->name, class_dev->name))
- continue;
- }
+ len = strlen(dev->name);
+ if (strncmp_wildcard(class_dev->name, dev->name, sizeof(dev->name)))
+ continue;
if (dev->mode != 0) {
- dbg_parse("found permissions from config for '%s'", class_dev->name);
+ dbg_parse("found permissions for '%s'", class_dev->name);
udev->mode = dev->mode;
strfieldcpy(udev->owner, dev->owner);
strfieldcpy(udev->group, dev->group);
* up in the kernel...
*/
if (strstr(class_dev->path, "block")) {
- dbg_parse("looking at block device...");
+ dbg_parse("looking at block device");
if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
char path[SYSFS_PATH_MAX];
- dbg_parse("really is a partition...");
+ dbg_parse("really is a partition");
strfieldcpy(path, class_dev->path);
temp = strrchr(path, '/');
*temp = 0x00;
if (class_dev_parent == NULL) {
dbg("sysfs_open_class_device at '%s' failed", path);
} else {
- dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
+ dbg_parse("class_dev_parent->name='%s'", class_dev_parent->name);
if (class_dev_parent->sysdevice)
sysfs_device = class_dev_parent->sysdevice;
}
}
if (sysfs_device) {
- dbg_parse("sysfs_device->path = '%s'", sysfs_device->path);
- dbg_parse("sysfs_device->bus_id = '%s'", sysfs_device->bus_id);
+ dbg_parse("sysfs_device->path='%s'", sysfs_device->path);
+ dbg_parse("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+ strfieldcpy(udev->bus_id, sysfs_device->bus_id);
} else {
dbg_parse("class_dev->name = '%s'", class_dev->name);
}
+ build_kernel_number(class_dev, udev);
+
/* rules are looked at in priority order */
retval = do_callout(class_dev, udev);
if (retval == 0)
found:
/* substitute placeholder in NAME */
- while (1) {
- char *pos = strchr(udev->name, '%');
- char *dig;
- char name[NAME_SIZE];
- if (pos) {
- strfieldcpy(name, pos+2);
- *pos = 0x00;
- switch (pos[1]) {
- case 'b':
- if (!sysfs_device)
- break;
- strcat(udev->name, sysfs_device->bus_id);
- dbg("bus_id appended: %s",
- sysfs_device->bus_id);
- break;
- case 'n':
- dig = class_dev->name + strlen(class_dev->name);
- while (isdigit(*(dig-1)))
- dig--;
- strcat(udev->name, dig);
- dbg("kernel number appended: %s", dig);
- break;
- case 'm':
- sprintf(pos, "%u", udev->minor);
- dbg("minor number appended: %u", udev->minor);
- break;
- case 'M':
- sprintf(pos, "%u", udev->major);
- dbg("major number appended: %u", udev->major);
- break;
- default:
- dbg("unknown substitution type: %%%c", pos[1]);
- break;
- }
- strcat(udev->name, name);
- } else
- break;
- }
+ apply_format(udev, udev->name);
done:
/* mode was never set above */
dump_dev_list();
return retval;
}
-
-
~ianmdlvl / elogind.git / blobdiff