#include <ctype.h>
#include <unistd.h>
#include <errno.h>
-#include <time.h>
#include <sys/wait.h>
#include <sys/stat.h>
+#include "libsysfs/sysfs/libsysfs.h"
#include "list.h"
#include "udev.h"
+#include "udev_utils.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
-#include "libsysfs/libsysfs.h"
-#include "klibc_fixups.h"
+#include "udev_db.h"
-LIST_HEAD(config_device_list);
-LIST_HEAD(perm_device_list);
+static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
static int strcmp_pattern(const char *p, const char *s)
return 1;
}
-#define copy_var(a, b, var) \
- if (b->var) \
- a->var = b->var;
-
-#define copy_string(a, b, var) \
- if (strlen(b->var)) \
- strcpy(a->var, b->var);
-
-int add_perm_dev(struct perm_device *new_dev)
+/* extract possible {attr} and move str behind it */
+static char *get_format_attribute(char **str)
{
- struct perm_device *dev;
- struct perm_device *tmp_dev;
-
- /* update the values if we already have the device */
- list_for_each_entry(dev, &perm_device_list, 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 perm_device *perm;
+ char *pos;
+ char *attr = NULL;
- list_for_each_entry(perm, &perm_device_list, node) {
- if (strcmp_pattern(perm->name, name))
- continue;
- return perm;
+ if (*str[0] == '{') {
+ pos = strchr(*str, '}');
+ if (pos == NULL) {
+ dbg("missing closing brace for format");
+ return NULL;
+ }
+ pos[0] = '\0';
+ attr = *str+1;
+ *str = pos+1;
+ dbg("attribute='%s', str='%s'", attr, *str);
}
- return NULL;
+ return attr;
}
-static mode_t get_default_mode(void)
+/* extract possible format length and move str behind it*/
+static int get_format_len(char **str)
{
- mode_t mode = 0600; /* default to owner rw only */
-
- if (strlen(default_mode_str) != 0)
- mode = strtol(default_mode_str, NULL, 8);
+ int num;
+ char *tail;
- return mode;
+ if (isdigit(*str[0])) {
+ num = (int) strtoul(*str, &tail, 10);
+ if (num > 0) {
+ *str = tail;
+ dbg("format length=%i", num);
+ return num;
+ } else {
+ dbg("format parsing error '%s'", *str);
+ }
+ }
+ return -1;
}
-static char *get_default_owner(void)
+/** Finds the lowest positive N such that <name>N isn't present in
+ * $(udevroot) either as a file or a symlink.
+ *
+ * @param name Name to check for
+ * @return 0 if <name> didn't exist and N otherwise.
+ */
+static int find_free_number(struct udevice *udev, const char *name)
{
- if (strlen(default_owner_str) == 0)
- strncpy(default_owner_str, "root", OWNER_SIZE);
-
- return default_owner_str;
-}
+ char filename[NAME_SIZE];
+ int num = 0;
+ struct udevice db_udev;
-static char *get_default_group(void)
-{
- if (strlen(default_group_str) == 0)
- strncpy(default_group_str, "root", GROUP_SIZE);
+ strfieldcpy(filename, name);
+ while (1) {
+ dbg("look for existing node '%s'", filename);
+ memset(&db_udev, 0x00, sizeof(struct udevice));
+ if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+ dbg("free num=%d", num);
+ return num;
+ }
- return default_group_str;
+ num++;
+ if (num > 1000) {
+ info("find_free_number gone crazy (num=%d), aborted", num);
+ return -1;
+ }
+ snprintf(filename, NAME_SIZE, "%s%d", name, num);
+ filename[NAME_SIZE-1] = '\0';
+ }
}
-static void apply_format(struct udevice *udev, unsigned char *string)
+static void apply_format(struct udevice *udev, char *string, size_t maxsize,
+ struct sysfs_class_device *class_dev,
+ struct sysfs_device *sysfs_device)
{
char temp[NAME_SIZE];
- char temp1[NAME_SIZE];
+ char temp2[NAME_SIZE];
char *tail;
char *pos;
- char *pos2;
- char *pos3;
- int num;
+ char *attr;
+ int len;
+ int i;
+ char c;
+ char *spos;
+ char *rest;
+ int slen;
+ struct sysfs_attribute *tmpattr;
+ unsigned int next_free_number;
pos = string;
while (1) {
- num = 0;
pos = strchr(pos, '%');
+ if (pos == NULL)
+ break;
- if (pos) {
- pos[0] = '\0';
- tail = pos+1;
- if (isdigit(tail[0])) {
- num = (int) strtoul(&pos[1], &tail, 10);
- if (tail == NULL) {
- dbg("format parsing error '%s'", pos+1);
- break;
- }
- }
- strfieldcpy(temp, tail+1);
+ pos[0] = '\0';
+ tail = pos+1;
+ len = get_format_len(&tail);
+ c = tail[0];
+ strfieldcpy(temp, tail+1);
+ tail = temp;
+ dbg("format=%c, string='%s', tail='%s'",c , string, tail);
+ attr = get_format_attribute(&tail);
- switch (tail[0]) {
- case 'b':
- if (strlen(udev->bus_id) == 0)
- break;
- strcat(pos, udev->bus_id);
- dbg("substitute bus_id '%s'", udev->bus_id);
+
+ switch (c) {
+ case 'b':
+ if (strlen(udev->bus_id) == 0)
break;
- case 'k':
- if (strlen(udev->kernel_name) == 0)
- break;
- strcat(pos, udev->kernel_name);
- dbg("substitute kernel name '%s'", udev->kernel_name);
+ strfieldcatmax(string, udev->bus_id, maxsize);
+ dbg("substitute bus_id '%s'", udev->bus_id);
+ break;
+ case 'k':
+ if (strlen(udev->kernel_name) == 0)
break;
- case 'n':
- if (strlen(udev->kernel_number) == 0)
- break;
- strcat(pos, udev->kernel_number);
- dbg("substitute kernel number '%s'", udev->kernel_number);
+ strfieldcatmax(string, udev->kernel_name, maxsize);
+ dbg("substitute kernel name '%s'", udev->kernel_name);
+ break;
+ case 'n':
+ if (strlen(udev->kernel_number) == 0)
break;
- case 'm':
- sprintf(pos, "%u", udev->minor);
- dbg("substitute minor number '%u'", udev->minor);
+ strfieldcatmax(string, udev->kernel_number, maxsize);
+ dbg("substitute kernel number '%s'", udev->kernel_number);
break;
- case 'M':
- sprintf(pos, "%u", udev->major);
- dbg("substitute major number '%u'", udev->major);
+ case 'm':
+ strintcatmax(string, udev->minor, maxsize);
+ dbg("substitute minor number '%u'", udev->minor);
+ break;
+ case 'M':
+ strintcatmax(string, udev->major, maxsize);
+ dbg("substitute major number '%u'", udev->major);
+ break;
+ case 'c':
+ if (strlen(udev->program_result) == 0)
break;
- case 'c':
- if (strlen(udev->program_result) == 0)
+ /* get part part of the result string */
+ i = 0;
+ if (attr != NULL)
+ i = strtoul(attr, &rest, 10);
+ if (i > 0) {
+ foreach_strpart(udev->program_result, " \n\r", spos, slen) {
+ i--;
+ if (i == 0)
+ break;
+ }
+ if (i > 0) {
+ dbg("requested part of result string not found");
break;
- if (num) {
- /* get part of return string */
- strncpy(temp1, udev->program_result, sizeof(temp1));
- pos2 = temp1;
- while (num) {
- num--;
- pos3 = strsep(&pos2, " ");
- if (pos3 == NULL) {
- dbg("requested part of result string not found");
- break;
- }
- }
- if (pos3) {
- strcat(pos, pos3);
- dbg("substitute part of result string '%s'", pos3);
+ }
+ if (rest[0] == '+')
+ strfieldcpy(temp2, spos);
+ else
+ strfieldcpymax(temp2, spos, slen+1);
+ strfieldcatmax(string, temp2, maxsize);
+ dbg("substitute part of result string '%s'", temp2);
+ } else {
+ strfieldcatmax(string, udev->program_result, maxsize);
+ dbg("substitute result string '%s'", udev->program_result);
+ }
+ break;
+ case 's':
+ if (attr != NULL) {
+ tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
+ if (tmpattr == NULL) {
+ dbg("sysfa attribute '%s' not found", attr);
+ break;
+ }
+ /* strip trailing whitespace of matching value */
+ if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
+ i = len = strlen(tmpattr->value);
+ while (i > 0 && isspace(tmpattr->value[i-1]))
+ i--;
+ if (i < len) {
+ tmpattr->value[i] = '\0';
+ dbg("remove %i trailing whitespace chars from '%s'",
+ len - i, tmpattr->value);
}
- } else {
- strcat(pos, udev->program_result);
- dbg("substitute result string '%s'", udev->program_result);
}
- break;
- case '%':
- strcat(pos, "%");
- pos++;
- break;
- default:
- dbg("unknown substitution type '%%%c'", pos[1]);
- break;
+ strfieldcatmax(string, tmpattr->value, maxsize);
+ dbg("substitute sysfs value '%s'", tmpattr->value);
+ } else {
+ dbg("missing attribute");
}
- strcat(string, temp);
- } else
break;
- }
-}
-
-static struct bus_file {
- char *bus;
- char *file;
-} bus_files[] = {
- { .bus = "scsi", .file = "vendor" },
- { .bus = "usb", .file = "idVendor" },
- { .bus = "usb-serial", .file = "detach_state" },
- { .bus = "ide", .file = "detach_state" },
- { .bus = "pci", .file = "vendor" },
- {}
-};
-
-#define SECONDS_TO_WAIT_FOR_FILE 10
-static void wait_for_device_to_initialize(struct sysfs_device *sysfs_device)
-{
- /* sleep until we see the file for this specific bus type show up this
- * is needed because we can easily out-run the kernel in looking for
- * these files before the paticular subsystem has created them in the
- * sysfs tree properly.
- *
- * And people thought that the /sbin/hotplug event system was going to
- * be slow, poo on you for arguing that before even testing it...
- */
- struct bus_file *b = &bus_files[0];
- struct sysfs_attribute *tmpattr;
- int loop;
-
- while (1) {
- if (b->bus == NULL)
+ case '%':
+ strfieldcatmax(string, "%", maxsize);
+ pos++;
break;
- if (strcmp(sysfs_device->bus, b->bus) == 0) {
- tmpattr = NULL;
- loop = SECONDS_TO_WAIT_FOR_FILE;
- while (loop--) {
- dbg("looking for file '%s' on bus '%s'", b->file, b->bus);
- tmpattr = sysfs_get_device_attr(sysfs_device, b->file);
- if (tmpattr) {
- /* found it! */
- goto exit;
- }
- /* sleep to give the kernel a chance to create the file */
- sleep(1);
+ case 'e':
+ next_free_number = find_free_number(udev, string);
+ if (next_free_number > 0) {
+ sprintf(temp2, "%d", next_free_number);
+ strfieldcatmax(string, temp2, maxsize);
}
- dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
- goto exit;
+ break;
+ default:
+ dbg("unknown substitution type '%%%c'", c);
+ break;
}
- b++;
+ /* truncate to specified length */
+ if (len > 0)
+ pos[len] = '\0';
+
+ strfieldcatmax(string, tail, maxsize);
}
- dbg("did not find bus type '%s' on list of bus_id_files, contact greg@kroah.com", sysfs_device->bus);
-exit:
- return; /* here to prevent compiler warning... */
}
static void fix_kernel_name(struct udevice *udev)
}
}
-static int execute_program(char *path, char *value, int len)
+static int execute_program(struct udevice *udev, const char *path, char *value, int len)
{
int retval;
- int res;
+ int count;
int status;
int fds[2];
pid_t pid;
- int value_set = 0;
- char buffer[256];
char *pos;
- char *args[PROGRAM_MAXARG];
+ char arg[PROGRAM_SIZE];
+ char *argv[(PROGRAM_SIZE / 2) + 1];
int i;
- dbg("executing '%s'", path);
+ strfieldcpy(arg, path);
+ i = 0;
+ if (strchr(path, ' ')) {
+ pos = arg;
+ while (pos != NULL) {
+ if (pos[0] == '\'') {
+ /* don't separate if in apostrophes */
+ pos++;
+ argv[i] = strsep(&pos, "\'");
+ while (pos && pos[0] == ' ')
+ pos++;
+ } else {
+ argv[i] = strsep(&pos, " ");
+ }
+ dbg("arg[%i] '%s'", i, argv[i]);
+ i++;
+ }
+ argv[i] = NULL;
+ dbg("execute '%s' with parsed arguments", arg);
+ } else {
+ argv[0] = arg;
+ argv[1] = udev->subsystem;
+ argv[2] = NULL;
+ dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
+ }
+
retval = pipe(fds);
if (retval != 0) {
dbg("pipe failed");
return -1;
}
+
pid = fork();
switch(pid) {
case 0:
/* child */
- close(STDOUT_FILENO);
- dup(fds[1]); /* dup write side of pipe to STDOUT */
- if (strchr(path, ' ')) {
- /* exec with arguments */
- pos = path;
- for (i=0; i < PROGRAM_MAXARG-1; i++) {
- args[i] = strsep(&pos, " ");
- if (args[i] == NULL)
- break;
- }
- if (args[i]) {
- dbg("too many args - %d", i);
- args[i] = NULL;
- }
- retval = execv(args[0], args);
- } else {
- retval = execv(path, main_argv);
- }
- dbg("child execve failed");
+ /* dup2 write side of pipe to STDOUT */
+ dup2(fds[1], STDOUT_FILENO);
+ retval = execv(arg, argv);
+
+ info(FIELD_PROGRAM " execution of '%s' failed", path);
exit(1);
case -1:
dbg("fork failed");
/* parent reads from fds[0] */
close(fds[1]);
retval = 0;
+ i = 0;
while (1) {
- res = read(fds[0], buffer, sizeof(buffer) - 1);
- if (res <= 0)
+ count = read(fds[0], value + i, len - i-1);
+ if (count <= 0)
break;
- buffer[res] = '\0';
- if (res > len) {
+
+ i += count;
+ if (i >= len-1) {
dbg("result len %d too short", len);
retval = -1;
- }
- if (value_set) {
- dbg("result value already set");
- retval = -1;
- } else {
- value_set = 1;
- strncpy(value, buffer, len);
- pos = value + strlen(value)-1;
- if (pos[0] == '\n')
- pos[0] = '\0';
- dbg("result is '%s'", value);
+ break;
}
}
- close(fds[0]);
- res = wait(&status);
- if (res < 0) {
- dbg("wait failed result %d", res);
+
+ if (count < 0) {
+ dbg("read failed with '%s'", strerror(errno));
retval = -1;
}
+ if (i > 0 && value[i-1] == '\n')
+ i--;
+ value[i] = '\0';
+ dbg("result is '%s'", value);
+
+ close(fds[0]);
+ waitpid(pid, &status, 0);
+
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
dbg("exec program status 0x%x", status);
retval = -1;
return retval;
}
-static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
+static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr)
{
struct sysfs_attribute *tmpattr = NULL;
char *c;
- if ((pair == NULL) || (pair->file[0] == '\0') || (pair->value == '\0'))
- return -ENODEV;
-
- dbg("look for device attribute '%s'", pair->file);
+ dbg("look for device attribute '%s'", attr);
/* try to find the attribute in the class device directory */
- tmpattr = sysfs_get_classdev_attr(class_dev, pair->file);
+ tmpattr = sysfs_get_classdev_attr(class_dev, attr);
if (tmpattr)
- goto label_found;
+ goto attr_found;
/* look in the class device directory if present */
if (sysfs_device) {
- tmpattr = sysfs_get_device_attr(sysfs_device, pair->file);
+ tmpattr = sysfs_get_device_attr(sysfs_device, attr);
if (tmpattr)
- goto label_found;
+ goto attr_found;
+ }
+
+ return NULL;
+
+attr_found:
+ c = strchr(tmpattr->value, '\n');
+ if (c != NULL)
+ c[0] = '\0';
+
+ dbg("found attribute '%s'", tmpattr->path);
+ return tmpattr;
+}
+
+static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
+{
+ struct sysfs_attribute *tmpattr;
+ int i;
+ int len;
+
+ if ((pair == NULL) || (pair->file[0] == '\0') || (pair->value == '\0'))
+ return -ENODEV;
+
+ tmpattr = find_sysfs_attribute(class_dev, sysfs_device, pair->file);
+ if (tmpattr == NULL)
+ return -ENODEV;
+
+ /* strip trailing whitespace of value, if not asked to match for it */
+ if (! isspace(pair->value[strlen(pair->value)-1])) {
+ i = len = strlen(tmpattr->value);
+ while (i > 0 && isspace(tmpattr->value[i-1]))
+ i--;
+ if (i < len) {
+ tmpattr->value[i] = '\0';
+ dbg("remove %i trailing whitespace chars from '%s'",
+ len - i, tmpattr->value);
+ }
}
- return -ENODEV;
-label_found:
- c = tmpattr->value + strlen(tmpattr->value)-1;
- if (*c == '\n')
- *c = 0x00;
dbg("compare attribute '%s' value '%s' with '%s'",
pair->file, tmpattr->value, pair->value);
if (strcmp_pattern(pair->value, tmpattr->value) != 0)
return 0;
}
-static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_dev)
-{
- struct sysfs_device *sysfs_device;
- struct sysfs_class_device *class_dev_parent;
- struct timespec tspec;
- int loop;
-
- /* Figure out where the device symlink is at. For char devices this will
- * always be in the class_dev->path. But for block devices, it's different.
- * The main block device will have the device symlink in it's path, but
- * all partitions have the symlink in its parent directory.
- * But we need to watch out for block devices that do not have parents, yet
- * look like a partition (fd0, loop0, etc.) They all do not have a device
- * symlink yet. We do sit and spin on waiting for them right now, we should
- * possibly have a whitelist for these devices here...
- */
- class_dev_parent = sysfs_get_classdev_parent(class_dev);
- if (class_dev_parent)
- dbg("Really a partition");
-
- tspec.tv_sec = 0;
- tspec.tv_nsec = 10000000; /* sleep 10 millisec */
- loop = 10;
- while (loop--) {
- nanosleep(&tspec, NULL);
- if (class_dev_parent)
- sysfs_device = sysfs_get_classdev_device(class_dev_parent);
- else
- sysfs_device = sysfs_get_classdev_device(class_dev);
-
- if (sysfs_device != NULL)
- goto device_found;
- }
- dbg("timed out waiting for device symlink, continuing on anyway...");
-
-device_found:
- /* We have another issue with just the wait above - the sysfs part of
- * the kernel may not be quick enough to have created the link to the
- * device under the "bus" subsystem. Due to this, the sysfs_device->bus
- * will not contain the actual bus name :(
- *
- * Libsysfs now provides a new API sysfs_get_device_bus(), so use it
- * if needed
- */
- if (sysfs_device) {
- if (sysfs_device->bus[0] != '\0')
- goto bus_found;
-
- loop = 10;
- tspec.tv_nsec = 10000000;
- while (loop--) {
- nanosleep(&tspec, NULL);
- sysfs_get_device_bus(sysfs_device);
-
- if (sysfs_device->bus[0] != '\0')
- goto bus_found;
- }
- dbg("timed out waiting to find the device bus, continuing on anyway");
- goto exit;
-bus_found:
- dbg("device %s is registered with bus '%s'",
- sysfs_device->name, sysfs_device->bus);
- }
-exit:
- return sysfs_device;
-}
-
-static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_rule(struct udevice *udev, struct config_device *dev,
+ struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
while (1) {
/* check for matching bus value */
dbg("device has no bus");
goto try_parent;
}
- dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+ dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'",
+ dev->bus, sysfs_device->bus);
if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
dbg(FIELD_BUS " is not matching");
goto try_parent;
}
}
- /* check for matching kernel name*/
+ /* check for matching kernel name */
if (dev->kernel[0] != '\0') {
- dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
+ dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'",
+ dev->kernel, class_dev->name);
if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
dbg(FIELD_KERNEL " is not matching");
goto try_parent;
}
}
+ /* check for matching subsystem */
+ if (dev->subsystem[0] != '\0') {
+ dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
+ dev->subsystem, class_dev->name);
+ if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
+ dbg(FIELD_SUBSYSTEM " is not matching");
+ goto try_parent;
+ } else {
+ dbg(FIELD_SUBSYSTEM " matches");
+ }
+ }
+
+ /* check for matching driver */
+ if (dev->driver[0] != '\0') {
+ dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'",
+ dev->driver, sysfs_device->driver_name);
+ if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
+ dbg(FIELD_DRIVER " is not matching");
+ goto try_parent;
+ } else {
+ dbg(FIELD_DRIVER " matches");
+ }
+ }
+
/* check for matching bus id */
if (dev->id[0] != '\0') {
dbg("check " FIELD_ID);
/* execute external program */
if (dev->program[0] != '\0') {
+ char program[PROGRAM_SIZE];
+
dbg("check " FIELD_PROGRAM);
- apply_format(udev, dev->program);
- if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
- dbg(FIELD_PROGRAM " returned nozero");
+ strfieldcpy(program, dev->program);
+ apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
+ if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
+ dbg(FIELD_PROGRAM " returned nonzero");
goto try_parent;
} else {
dbg(FIELD_PROGRAM " returned successful");
/* check for matching result of external program */
if (dev->result[0] != '\0') {
- dbg("check for " FIELD_RESULT
- " dev->result='%s', udev->program_result='%s'",
+ dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
return -ENODEV;
dbg("sysfs_device->path='%s'", sysfs_device->path);
dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
- dbg("sysfs_device->bus='%s'", sysfs_device->bus);
}
}
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
+int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
{
+ struct sysfs_class_device *class_dev_parent;
struct sysfs_device *sysfs_device = NULL;
struct config_device *dev;
- struct perm_device *perm;
char *pos;
- udev->mode = 0;
+ dbg("class_dev->name='%s'", class_dev->name);
+
+ /* Figure out where the "device"-symlink is at. For char devices this will
+ * always be in the class_dev->path. On block devices, only the main block
+ * device will have the device symlink in it's path. All partition devices
+ * need to look at the symlink in its parent directory.
+ */
+ class_dev_parent = sysfs_get_classdev_parent(class_dev);
+ if (class_dev_parent != NULL) {
+ dbg("given class device has a parent, use this instead");
+ sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+ } else {
+ sysfs_device = sysfs_get_classdev_device(class_dev);
+ }
- /* find the sysfs_device associated with this class device */
- sysfs_device = get_sysfs_device(class_dev);
if (sysfs_device) {
- dbg("sysfs_device->path='%s'", sysfs_device->path);
- dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
- dbg("sysfs_device->bus='%s'", sysfs_device->bus);
+ dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
+ sysfs_device->path, sysfs_device->bus_id, sysfs_device->bus);
strfieldcpy(udev->bus_id, sysfs_device->bus_id);
- wait_for_device_to_initialize(sysfs_device);
}
- dbg("class_dev->name = '%s'", class_dev->name);
strfieldcpy(udev->kernel_name, class_dev->name);
fix_kernel_name(udev);
/* look for a matching rule to apply */
list_for_each_entry(dev, &config_device_list, node) {
dbg("process rule");
- if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
- if (dev->name[0] == '\0') {
- info("configured rule in '%s' at line %i applied, '%s' is ignored",
- udev_rules_filename, dev->config_line, udev->kernel_name);
- return -1;
+ if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
+ if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
+ /* empty name, symlink, perms will not create any node */
+ if (dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0') {
+ info("configured rule in '%s[%i]' applied, '%s' is ignored",
+ dev->config_file, dev->config_line, udev->kernel_name);
+ return -1;
+ }
+
+ /* apply permissions only rule values */
+ if (dev->mode != 0000) {
+ udev->mode = dev->mode;
+ dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+ }
+ if (dev->owner[0] != '\0') {
+ strfieldcpy(udev->owner, dev->owner);
+ apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+ dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
+ }
+ if (dev->group[0] != '\0') {
+ strfieldcpy(udev->group, dev->group);
+ apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+ dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
+ }
}
- info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
- udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- goto found;
- }
- }
+ /* collect symlinks for the final matching rule */
+ if (dev->symlink[0] != '\0') {
+ char temp[NAME_SIZE];
+
+ info("configured rule in '%s[%i]' applied, added symlink '%s'",
+ dev->config_file, dev->config_line, dev->symlink);
+ strfieldcpy(temp, dev->symlink);
+ apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
+ if (udev->symlink[0] != '\0')
+ strfieldcat(udev->symlink, " ");
+ strfieldcat(udev->symlink, temp);
+ }
- /* no rule was found so we use the kernel name */
- strfieldcpy(udev->name, class_dev->name);
- goto done;
-
-found:
- /* substitute placeholder */
- apply_format(udev, udev->name);
- apply_format(udev, udev->symlink);
-
-done:
- 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();
- strncpy(udev->owner, get_default_owner(), OWNER_SIZE);
- strncpy(udev->group, get_default_group(), GROUP_SIZE);
- }
- dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
- udev->name, udev->owner, udev->group, udev->mode);
+ /* rule matches */
+ if (dev->name[0] != '\0') {
+ /* apply all_partitions flag only at a main block device */
+ if (dev->partitions > 0 &&
+ (udev->type != 'b' || udev->kernel_number[0] != '\0'))
+ continue;
- return 0;
-}
+ info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
+ dev->config_file, dev->config_line, udev->kernel_name, dev->name);
-int namedev_init(void)
-{
- int retval;
+ strfieldcpy(udev->name, dev->name);
+ apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+ strfieldcpy(udev->config_file, dev->config_file);
+ udev->config_line = dev->config_line;
+ udev->ignore_remove = dev->ignore_remove;
- retval = namedev_init_rules();
- if (retval)
- return retval;
+ if (udev->type == 'n')
+ goto exit;
- retval = namedev_init_permissions();
- if (retval)
- return retval;
+ udev->partitions = dev->partitions;
+ if (dev->mode != 0000)
+ udev->mode = dev->mode;
+ if (dev->owner[0] != '\0') {
+ strfieldcpy(udev->owner, dev->owner);
+ apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+ }
+ if (dev->group[0] != '\0') {
+ strfieldcpy(udev->group, dev->group);
+ apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+ }
- dump_config_dev_list();
- dump_perm_dev_list();
- return retval;
+ dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
+ udev->name, udev->owner, udev->group, udev->mode);
+
+ goto exit;
+ }
+ }
+ }
+
+ /* no rule matched, so we use the kernel name */
+ strfieldcpy(udev->name, udev->kernel_name);
+ dbg("no rule found, use kernel name '%s'", udev->name);
+
+exit:
+ return 0;
}
~ianmdlvl / elogind.git / blobdiff