#include <ctype.h>
#include <unistd.h>
#include <errno.h>
-#include <time.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/sysinfo.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "list.h"
#include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
-#include "klibc_fixups.h"
-#include "udevdb.h"
+#include "udev_db.h"
static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
* @param name Name to check for
* @return 0 if <name> didn't exist and N otherwise.
*/
-static unsigned int find_free_number (struct udevice *udev, char *name)
+static int find_free_number(struct udevice *udev, const char *name)
{
- char temp[NAME_SIZE];
- char path[NAME_SIZE];
- struct udevice dev;
- int result;
+ char filename[NAME_SIZE];
+ int num = 0;
+ struct udevice db_udev;
- /* have to sweep the database for each lookup */
- result = 0;
- strncpy(temp, name, sizeof (temp));
+ strfieldcpy(filename, name);
while (1) {
- if (udevdb_get_dev_byname(temp, path, &dev) != 0)
- goto found;
- /* symlink might be stale if $(udevroot) isn't cleaned; check
- * on major/minor to see if it's the same device
- */
- if (dev.major == udev->major && dev.minor == udev->minor)
- goto found;
- snprintf (temp, sizeof(temp), "%s%d", name, ++result);
- }
+ 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;
+ }
-found:
- return result;
+ 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, char *string, size_t maxsize,
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);
+ }
+ }
strfieldcatmax(string, tmpattr->value, maxsize);
dbg("substitute sysfs value '%s'", tmpattr->value);
} else {
case 'e':
next_free_number = find_free_number(udev, string);
if (next_free_number > 0) {
- snprintf(temp2, sizeof(temp2), "%d", next_free_number);
+ sprintf(temp2, "%d", next_free_number);
strfieldcatmax(string, temp2, maxsize);
}
break;
}
}
-/*
- * Note, we can have multiple files for different busses in here due
- * to the mess that USB has for its device tree...
- */
-static struct bus_file {
- char *bus;
- char *file;
-} bus_files[] = {
- { .bus = "scsi", .file = "vendor" },
- { .bus = "usb", .file = "idVendor" },
- { .bus = "usb", .file = "iInterface" },
- { .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 found = 0;
- int loop = SECONDS_TO_WAIT_FOR_FILE;
-
- while (1) {
- if (b->bus == NULL) {
- if (!found)
- break;
- /* sleep to give the kernel a chance to create the file */
- sleep(1);
- --loop;
- if (loop == 0)
- break;
- b = &bus_files[0];
- }
- if (strcmp(sysfs_device->bus, b->bus) == 0) {
- found = 1;
- 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;
- }
- dbg("can't find '%s' file", b->file);
- }
- ++b;
- }
- if (!found)
- 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)
{
char *temp = udev->kernel_name;
}
}
-static int execute_program(const char *path, char *value, int len)
+static int execute_program(struct udevice *udev, const char *path, char *value, int len)
{
int retval;
int count;
dbg("execute '%s' with parsed arguments", arg);
} else {
argv[0] = arg;
- argv[1] = main_argv[1];
+ argv[1] = udev->subsystem;
argv[2] = NULL;
dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
}
- /* set basename() only */
- pos = strrchr(argv[0], '/');
- if (pos != NULL)
- argv[0] = &pos[1];
-
retval = pipe(fds);
if (retval != 0) {
dbg("pipe failed");
dbg("result is '%s'", value);
close(fds[0]);
- wait(&status);
+ waitpid(pid, &status, 0);
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
dbg("exec program status 0x%x", status);
return 0;
}
-static int whitelist_search(struct sysfs_class_device *class_dev)
-{
- char *sysblock = "/sys/block";
- int i;
-
- static char *list[] = {
- "nb",
- "ram",
- "loop",
- "fd",
- "md",
- "dos_cd",
- "double",
- "flash",
- "msd",
- "rflash",
- "rom",
- "rrom",
- "sbpcd",
- "pcd",
- "pf",
- "scd",
- "ubd",
- NULL,
- };
-
- if (strncmp(class_dev->path, sysblock, strlen(sysblock)))
- return 0;
-
- for (i=0; list[i] != NULL; i++)
- if (!strncmp(class_dev->name, list[i], strlen(list[i])))
- return 1;
-
- 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 unless
- * they happen to be in the whitelist in which case we exit.
- */
- class_dev_parent = sysfs_get_classdev_parent(class_dev);
- if (class_dev_parent != NULL)
- dbg("given class device has a parent, use this instead");
-
- tspec.tv_sec = 0;
- tspec.tv_nsec = 10000000; /* sleep 10 millisec */
- loop = 10;
- while (loop--) {
- if (udev_sleep) {
- if (whitelist_search(class_dev)) {
- sysfs_device = NULL;
- goto exit;
- }
- 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 :(
- */
- if (sysfs_device) {
- if (sysfs_device->bus[0] != '\0')
- goto bus_found;
-
- loop = 10;
- tspec.tv_nsec = 10000000;
- while (loop--) {
- if (udev_sleep)
- 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)
{
while (1) {
}
}
- /* 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);
if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
}
}
+ /* 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);
dbg("check " FIELD_PROGRAM);
strfieldcpy(program, dev->program);
apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
- if (execute_program(program, udev->program_result, NAME_SIZE) != 0) {
+ if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nonzero");
goto try_parent;
} else {
}
-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);
+ strfieldcpy(udev->bus, sysfs_device->bus);
}
- dbg("class_dev->name = '%s'", class_dev->name);
strfieldcpy(udev->kernel_name, class_dev->name);
fix_kernel_name(udev);
goto done;
udev->partitions = dev->partitions;
+ udev->ignore_remove = dev->ignore_remove;
/* get permissions given in rule */
set_empty_perms(udev, dev->mode,
set_empty_perms(udev, perm->mode,
perm->owner,
perm->group);
- } else {
- set_empty_perms(udev, get_default_mode(),
- get_default_owner(),
- get_default_group());
}
+ set_empty_perms(udev, get_default_mode(),
+ get_default_owner(),
+ get_default_group());
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);