#include "klibc_fixups.h"
LIST_HEAD(config_device_list);
+LIST_HEAD(perm_device_list);
/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
static int strcmp_pattern(const char *p, const char *s)
if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
continue;
copy_var(dev, new_dev, type);
- 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, place);
copy_string(dev, new_dev, kernel_name);
copy_string(dev, new_dev, exec_program);
- copy_string(dev, new_dev, owner);
- copy_string(dev, new_dev, group);
+ copy_string(dev, new_dev, symlink);
return 0;
}
return 0;
}
+int add_perm_dev(struct perm_device *new_dev)
+{
+ struct list_head *tmp;
+ struct perm_device *tmp_dev;
+
+ /* update the values if we already have the device */
+ list_for_each(tmp, &perm_device_list) {
+ struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+ if (strcmp_pattern(new_dev->name, dev->name))
+ continue;
+ copy_var(dev, new_dev, mode);
+ copy_string(dev, new_dev, owner);
+ copy_string(dev, new_dev, group);
+ return 0;
+ }
+
+ /* not found, add new structure to the perm list */
+ tmp_dev = malloc(sizeof(*tmp_dev));
+ if (!tmp_dev)
+ return -ENOMEM;
+ memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
+ list_add_tail(&tmp_dev->node, &perm_device_list);
+ //dump_perm_dev(tmp_dev);
+ return 0;
+}
+
+static struct perm_device *find_perm(char *name)
+{
+ struct list_head *tmp;
+ struct perm_device *perm = NULL;
+
+ list_for_each(tmp, &perm_device_list) {
+ perm = list_entry(tmp, struct perm_device, node);
+ if (strcmp_pattern(perm->name, name))
+ continue;
+ return perm;
+ }
+ return NULL;
+}
+
static mode_t get_default_mode(struct sysfs_class_device *class_dev)
{
mode_t mode = 0600; /* default to owner rw only */
break;
case 'D':
if (strlen(udev->kernel_number) == 0) {
- strcat(pos, "disk");
+ strcat(pos, "disc");
break;
}
strcat(pos, "part");
if (strcmp_pattern(dev->id, udev->callout_value) != 0)
continue;
strfieldcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strfieldcpy(udev->owner, dev->owner);
- strfieldcpy(udev->group, dev->group);
- }
- dbg("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);
+ strfieldcpy(udev->symlink, dev->symlink);
+ dbg("callout returned matching value '%s', '%s' becomes '%s'",
+ dev->id, class_dev->name, udev->name);
return 0;
}
return -ENODEV;
struct sysfs_attribute *tmpattr = NULL;
struct config_device *dev;
struct list_head *tmp;
+ char *c;
list_for_each(tmp, &config_device_list) {
dev = list_entry(tmp, struct config_device, node);
continue;
label_found:
- tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+ c = tmpattr->value + strlen(tmpattr->value)-1;
+ if (*c == '\n')
+ *c = 0x00;
dbg("compare attribute '%s' value '%s' with '%s'",
dev->sysfs_file, tmpattr->value, dev->sysfs_value);
- if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+ if (strcmp_pattern(dev->sysfs_value, tmpattr->value) != 0)
continue;
strfieldcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strfieldcpy(udev->owner, dev->owner);
- strfieldcpy(udev->group, dev->group);
- }
- dbg("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);
+ strfieldcpy(udev->symlink, dev->symlink);
+ dbg("found matching attribute '%s', '%s' becomes '%s' ",
+ dev->sysfs_file, class_dev->name, udev->name);
return 0;
}
if (!found)
continue;
strfieldcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strfieldcpy(udev->owner, dev->owner);
- strfieldcpy(udev->group, dev->group);
- }
- dbg("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);
+ strfieldcpy(udev->symlink, dev->symlink);
+ dbg("found matching id '%s', '%s' becomes '%s'",
+ dev->id, class_dev->name, udev->name);
return 0;
}
return -ENODEV;
continue;
strfieldcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strfieldcpy(udev->owner, dev->owner);
- strfieldcpy(udev->group, dev->group);
- }
- dbg("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);
+ strfieldcpy(udev->symlink, dev->symlink);
+ dbg("found matching place '%s', '%s' becomes '%s'",
+ dev->place, class_dev->name, udev->name);
return 0;
}
return -ENODEV;
continue;
strfieldcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strfieldcpy(udev->owner, dev->owner);
- strfieldcpy(udev->group, dev->group);
- }
- dbg("found name, '%s' becomes '%s'"
- " - owner='%s', group='%s', mode = %#o",
- dev->kernel_name, udev->name,
- dev->owner, dev->group, dev->mode);
+ strfieldcpy(udev->symlink, dev->symlink);
+ dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
return 0;
}
static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
{
- struct config_device *dev;
- struct list_head *tmp;
- int len;
-
+ /* heh, this is pretty simple... */
strfieldcpy(udev->name, class_dev->name);
- /* look for permissions */
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
- len = strlen(dev->name);
- if (strcmp_pattern(dev->name, class_dev->name))
- continue;
- if (dev->mode != 0) {
- dbg("found permissions for '%s'", class_dev->name);
- udev->mode = dev->mode;
- strfieldcpy(udev->owner, dev->owner);
- strfieldcpy(udev->group, dev->group);
- }
- }
}
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
struct sysfs_device *sysfs_device = NULL;
struct sysfs_class_device *class_dev_parent = NULL;
int retval = 0;
- char *temp = NULL;
+ struct perm_device *perm;
udev->mode = 0;
/* find the sysfs_device for this class device */
/* Wouldn't it really be nice if libsysfs could do this for us? */
- if (class_dev->sysdevice) {
- sysfs_device = class_dev->sysdevice;
- } else {
+ sysfs_device = sysfs_get_classdev_device(class_dev);
+ if (sysfs_device == NULL) {
/* bah, let's go backwards up a level to see if the device is there,
* as block partitions don't point to the physical device. Need to fix that
* up in the kernel...
*/
- if (strstr(class_dev->path, "block")) {
+ if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
dbg("looking at block device");
if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
- char path[SYSFS_PATH_MAX];
-
dbg("really is a partition");
- strfieldcpy(path, class_dev->path);
- temp = strrchr(path, '/');
- *temp = 0x00;
- dbg("looking for a class device at '%s'", path);
- class_dev_parent = sysfs_open_class_device(path);
+ class_dev_parent = sysfs_get_classdev_parent
+ (class_dev);
if (class_dev_parent == NULL) {
- dbg("sysfs_open_class_device at '%s' failed", path);
+ dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
} else {
dbg("class_dev_parent->name='%s'", class_dev_parent->name);
- if (class_dev_parent->sysdevice)
- sysfs_device = class_dev_parent->sysdevice;
+ sysfs_device = sysfs_get_classdev_device(class_dev_parent);
}
}
}
}
-
+
if (sysfs_device) {
dbg("sysfs_device->path='%s'", sysfs_device->path);
dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
goto done;
found:
- /* substitute placeholder in NAME */
+ /* substitute placeholder */
apply_format(udev, udev->name);
+ apply_format(udev, udev->symlink);
done:
- /* mode was never set above */
- if (!udev->mode) {
+ perm = find_perm(udev->name);
+ if (perm) {
+ udev->mode = perm->mode;
+ strfieldcpy(udev->owner, perm->owner);
+ strfieldcpy(udev->group, perm->group);
+ } else {
+ /* no matching perms found :( */
udev->mode = get_default_mode(class_dev);
udev->owner[0] = 0x00;
udev->group[0] = 0x00;
}
-
- if (class_dev_parent)
- sysfs_close_class_device(class_dev_parent);
+ dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
+ udev->name, udev->owner, udev->group, udev->mode);
return 0;
}
int namedev_init(void)
{
int retval;
-
+
retval = namedev_init_rules();
if (retval)
return retval;
return retval;
dump_config_dev_list();
+ dump_perm_dev_list();
return retval;
}
~ianmdlvl / elogind.git / blobdiff