#include <sys/wait.h>
#include <sys/stat.h>
+#include "libsysfs/sysfs/libsysfs.h"
#include "list.h"
#include "udev.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
-#include "libsysfs/libsysfs.h"
#include "klibc_fixups.h"
+static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
+
LIST_HEAD(config_device_list);
LIST_HEAD(perm_device_list);
static char *get_default_owner(void)
{
if (strlen(default_owner_str) == 0)
- strncpy(default_owner_str, "root", OWNER_SIZE);
+ strfieldcpy(default_owner_str, "root");
return default_owner_str;
}
static char *get_default_group(void)
{
if (strlen(default_group_str) == 0)
- strncpy(default_group_str, "root", GROUP_SIZE);
+ strfieldcpy(default_group_str, "root");
return default_group_str;
}
-static void apply_format(struct udevice *udev, unsigned char *string)
+/* extract possible {attr} and move str behind it */
+static char *get_format_attribute(char **str)
+{
+ char *pos;
+ char *attr = NULL;
+
+ 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 attr;
+}
+
+/* extract possible format length and move str behind it*/
+static int get_format_len(char **str)
+{
+ int num;
+ char *tail;
+
+ 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 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;
+ int slen;
+ struct sysfs_attribute *tmpattr;
pos = string;
- while (1) {
- num = 0;
- pos = strchr(pos, '%');
- if (pos) {
+ while (1) {
+ pos = strchr(string, '%');
+ if (pos != NULL) {
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;
- }
- }
+ len = get_format_len(&tail);
+ c = tail[0];
strfieldcpy(temp, tail+1);
+ tail = temp;
+ } else {
+ break;
+ }
+ dbg("format=%c, string='%s', tail='%s'",c , string, 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);
+ attr = get_format_attribute(&tail);
+
+ 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);
+ strnfieldcat(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);
+ strnfieldcat(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);
+ strnfieldcat(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':
+ strnintcat(string, udev->minor, maxsize);
+ dbg("substitute minor number '%u'", udev->minor);
+ break;
+ case 'M':
+ strnintcat(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 = atoi(attr);
+ 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);
- }
- } 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;
+ strnfieldcpy(temp2, spos, slen+1);
+ strnfieldcat(string, temp2, maxsize);
+ dbg("substitute part of result string '%s'", temp2);
+ } else {
+ strnfieldcat(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;
+ }
+ strnfieldcat(string, tmpattr->value, maxsize);
+ dbg("substitute sysfs value '%s'", tmpattr->value);
+ } else {
+ dbg("missing attribute");
}
- strcat(string, temp);
- } else
break;
+ case '%':
+ strnfieldcat(string, "%", maxsize);
+ break;
+ default:
+ dbg("unknown substitution type '%%%c'", c);
+ break;
+ }
+ /* truncate to specified length */
+ if (len > 0)
+ pos[len] = '\0';
+
+ strnfieldcat(string, tail, maxsize);
}
}
int fds[2];
pid_t pid;
int value_set = 0;
- char buffer[256];
+ char buffer[255];
char *pos;
char *args[PROGRAM_MAXARG];
int i;
case 0:
/* child */
close(STDOUT_FILENO);
- dup(fds[1]); /* dup write side of pipe to STDOUT */
+
+ /* dup write side of pipe to STDOUT */
+ dup(fds[1]);
+
+ /* copy off our path to use incase we have too many args */
+ strnfieldcpy(buffer, path, sizeof(buffer));
+
if (strchr(path, ' ')) {
/* exec with arguments */
pos = path;
break;
}
if (args[i]) {
- dbg("too many args - %d", i);
- args[i] = NULL;
+ dbg("too many args - %d, using subshell instead '%s'", i, buffer);
+ retval = execl("/bin/sh", "sh", "-c", buffer, NULL);
+ } else {
+ dbg("execute program '%s'", path);
+ retval = execv(args[0], args);
}
- retval = execv(args[0], args);
} else {
retval = execv(path, main_argv);
}
- dbg("child execve failed");
+ info(FIELD_PROGRAM " execution of '%s' failed", path);
exit(1);
case -1:
dbg("fork failed");
strncpy(value, buffer, len);
pos = value + strlen(value)-1;
if (pos[0] == '\n')
- pos[0] = '\0';
+ pos[0] = '\0';
dbg("result is '%s'", value);
}
}
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 -ENODEV;
-label_found:
- c = tmpattr->value + strlen(tmpattr->value)-1;
- if (*c == '\n')
- *c = 0x00;
+ 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;
+
+ 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;
+
dbg("compare attribute '%s' value '%s' with '%s'",
pair->file, tmpattr->value, pair->value);
if (strcmp_pattern(pair->value, tmpattr->value) != 0)
tspec.tv_nsec = 10000000; /* sleep 10 millisec */
loop = 10;
while (loop--) {
- nanosleep(&tspec, NULL);
+ if (udev_sleep)
+ nanosleep(&tspec, NULL);
if (class_dev_parent)
sysfs_device = sysfs_get_classdev_device(class_dev_parent);
else
loop = 10;
tspec.tv_nsec = 10000000;
while (loop--) {
- nanosleep(&tspec, NULL);
+ if (udev_sleep)
+ nanosleep(&tspec, NULL);
sysfs_get_device_bus(sysfs_device);
if (sysfs_device->bus[0] != '\0')
/* execute external program */
if (dev->program[0] != '\0') {
dbg("check " FIELD_PROGRAM);
- apply_format(udev, dev->program);
+ apply_format(udev, dev->program, sizeof(dev->program),
+ class_dev, sysfs_device);
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nozero");
goto try_parent;
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') {
+ if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
info("configured rule in '%s' at line %i applied, '%s' is ignored",
- udev_rules_filename, dev->config_line, udev->kernel_name);
+ dev->config_file, dev->config_line, udev->kernel_name);
return -1;
}
- 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;
+ if (dev->symlink[0] != '\0') {
+ char temp[NAME_MAX];
+
+ info("configured rule in '%s' at line %i applied, added symlink '%s'",
+ dev->config_file, dev->config_line, dev->symlink);
+ /* do not clobber dev */
+ strfieldcpy(temp, dev->symlink);
+ apply_format(udev, temp, sizeof(temp),
+ class_dev, sysfs_device);
+ strfieldcat(udev->symlink, temp);
+ strfieldcat(udev->symlink, " ");
+ }
+
+ if (dev->name[0] != '\0') {
+ info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+ dev->config_file, dev->config_line, udev->kernel_name, dev->name);
+ strfieldcpy(udev->name, dev->name);
+ goto found;
+ }
}
}
/* no rule was found so we use the kernel name */
- strfieldcpy(udev->name, class_dev->name);
+ strfieldcpy(udev->name, udev->kernel_name);
goto done;
found:
/* substitute placeholder */
- apply_format(udev, udev->name);
- apply_format(udev, udev->symlink);
-
+ apply_format(udev, udev->name, sizeof(udev->name),
+ class_dev, sysfs_device);
+ udev->partitions = dev->partitions;
done:
perm = find_perm(udev->name);
if (perm) {
} 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);
+ strfieldcpy(udev->owner, get_default_owner());
+ strfieldcpy(udev->group, get_default_group());
}
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);