#include <getopt.h>
#include "udev.h"
-#include "udev_rules.h"
-
-static int import_uevent_var(struct udev *udev, const char *devpath)
-{
- char path[UTIL_PATH_SIZE];
- static char value[4096]; /* must stay, used with putenv */
- ssize_t size;
- int fd;
- char *key;
- char *next;
- int rc = -1;
-
- /* read uevent file */
- util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
- util_strlcat(path, devpath, sizeof(path));
- util_strlcat(path, "/uevent", sizeof(path));
- fd = open(path, O_RDONLY);
- if (fd < 0)
- goto out;
- size = read(fd, value, sizeof(value));
- close(fd);
- if (size < 0)
- goto out;
- value[size] = '\0';
-
- /* import keys into environment */
- key = value;
- while (key[0] != '\0') {
- next = strchr(key, '\n');
- if (next == NULL)
- goto out;
- next[0] = '\0';
- info(udev, "import into environment: '%s'\n", key);
- putenv(key);
- key = &next[1];
- }
- rc = 0;
-out:
- return rc;
-}
int udevadm_test(struct udev *udev, int argc, char *argv[])
{
- int force = 0;
+ char filename[UTIL_PATH_SIZE];
const char *action = "add";
- const char *subsystem = NULL;
- const char *devpath = NULL;
- struct udevice *udevice;
- struct sysfs_device *dev;
- struct udev_rules rules = {};
- int retval;
+ const char *syspath = NULL;
+ struct udev_event *event;
+ struct udev_device *dev;
+ struct udev_rules *rules = NULL;
+ int err;
int rc = 0;
static const struct option options[] = {
- { "action", 1, NULL, 'a' },
- { "subsystem", 1, NULL, 's' },
- { "force", 0, NULL, 'f' },
- { "help", 0, NULL, 'h' },
+ { "action", required_argument, NULL, 'a' },
+ { "help", no_argument, NULL, 'h' },
{}
};
info(udev, "version %s\n", VERSION);
- /* export log priority to executed programs */
- if (udev_get_log_priority(udev) > 0) {
- char priority[32];
-
- sprintf(priority, "%i", udev_get_log_priority(udev));
- setenv("UDEV_LOG", priority, 1);
- }
-
while (1) {
int option;
case 'a':
action = optarg;
break;
- case 's':
- subsystem = optarg;
- break;
- case 'f':
- force = 1;
- break;
case 'h':
- printf("Usage: udevadm test OPTIONS <devpath>\n"
+ printf("Usage: udevadm test OPTIONS <syspath>\n"
" --action=<string> set action string\n"
- " --subsystem=<string> set subsystem string\n"
- " --force don't skip node/link creation\n"
" --help print this help text\n\n");
exit(0);
default:
exit(1);
}
}
- devpath = argv[optind];
+ syspath = argv[optind];
- if (devpath == NULL) {
- fprintf(stderr, "devpath parameter missing\n");
+ if (syspath == NULL) {
+ fprintf(stderr, "syspath parameter missing\n");
rc = 1;
goto exit;
}
"some values may be different, or not available at a simulation run.\n"
"\n");
- udev_rules_init(udev, &rules, 0);
+ rules = udev_rules_new(udev, 1);
+ if (rules == NULL) {
+ fprintf(stderr, "error reading rules\n");
+ rc = 1;
+ goto exit;
+ }
- /* remove /sys if given */
- if (strncmp(devpath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) == 0)
- devpath = &devpath[strlen(udev_get_sys_path(udev))];
+ /* add /sys if needed */
+ if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
+ util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
+ util_strlcat(filename, syspath, sizeof(filename));
+ syspath = filename;
+ }
- dev = sysfs_device_get(udev, devpath);
+ dev = udev_device_new_from_syspath(udev, syspath);
if (dev == NULL) {
- fprintf(stderr, "unable to open device '%s'\n", devpath);
+ fprintf(stderr, "unable to open device '%s'\n", syspath);
rc = 2;
goto exit;
}
- udevice = udev_device_init(udev);
- if (udevice == NULL) {
- fprintf(stderr, "error initializing device\n");
- rc = 3;
- goto exit;
- }
-
- if (subsystem != NULL)
- util_strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
-
- /* override built-in sysfs device */
- udevice->dev = dev;
- util_strlcpy(udevice->action, action, sizeof(udevice->action));
- udevice->devt = udev_device_get_devt(udevice);
-
- /* simulate node creation with test flag */
- if (!force)
- udevice->test_run = 1;
+ /* skip reading of db, but read kernel parameters */
+ udev_device_set_info_loaded(dev);
+ udev_device_read_uevent_file(dev);
- setenv("DEVPATH", udevice->dev->devpath, 1);
- setenv("SUBSYSTEM", udevice->dev->subsystem, 1);
- setenv("ACTION", udevice->action, 1);
- import_uevent_var(udev, udevice->dev->devpath);
+ udev_device_set_action(dev, action);
+ event = udev_event_new(dev);
+ err = udev_event_execute_rules(event, rules);
- info(udev, "looking at device '%s' from subsystem '%s'\n", udevice->dev->devpath, udevice->dev->subsystem);
- retval = udev_device_event(&rules, udevice);
+ if (udev_device_get_event_timeout(dev) >= 0)
+ info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev));
- if (udevice->event_timeout >= 0)
- info(udev, "custom event timeout: %i\n", udevice->event_timeout);
+ if (err == 0 && !event->ignore_device && udev_get_run(udev)) {
+ struct udev_list_entry *entry;
- if (retval == 0 && !udevice->ignore_device && udev_get_run(udev)) {
- struct name_entry *name_loop;
-
- list_for_each_entry(name_loop, &udevice->run_list, node) {
+ udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) {
char program[UTIL_PATH_SIZE];
- util_strlcpy(program, name_loop->name, sizeof(program));
- udev_rules_apply_format(udevice, program, sizeof(program));
+ util_strlcpy(program, udev_list_entry_get_name(entry), sizeof(program));
+ udev_event_apply_format(event, program, sizeof(program));
info(udev, "run: '%s'\n", program);
}
}
- udev_device_cleanup(udevice);
-
+ udev_event_unref(event);
+ udev_device_unref(dev);
exit:
- udev_rules_cleanup(&rules);
+ udev_rules_unref(rules);
return rc;
}
~ianmdlvl / elogind.git / blobdiff