#include "udev.h"
#include "udev_rules.h"
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
- va_list args;
-
- if (priority > udev_log_priority)
- return;
-
- va_start(args, format);
- vprintf(format, args);
- va_end(args);
- if (format[strlen(format)-1] != '\n')
- printf("\n");
-}
-#endif
-
static int import_uevent_var(const char *devpath)
{
char path[PATH_SIZE];
if (next == NULL)
goto out;
next[0] = '\0';
- info("import into environment: '%s'", key);
+ info("import into environment: '%s'\n", key);
putenv(key);
key = &next[1];
}
return rc;
}
-int main(int argc, char *argv[], char *envp[])
+int udevtest(int argc, char *argv[], char *envp[])
{
int force = 0;
- char *action = "add";
- struct udev_rules rules = {};
- char *devpath = NULL;
+ const char *action = "add";
+ const char *subsystem = NULL;
+ const char *devpath = NULL;
struct udevice *udev;
struct sysfs_device *dev;
+ struct udev_rules rules = {};
int retval;
int rc = 0;
static const struct option options[] = {
{ "action", 1, NULL, 'a' },
+ { "subsystem", 1, NULL, 's' },
{ "force", 0, NULL, 'f' },
{ "help", 0, NULL, 'h' },
{}
};
- info("version %s", UDEV_VERSION);
+ info("version %s\n", UDEV_VERSION);
udev_config_init();
if (udev_log_priority < LOG_INFO) {
char priority[32];
while (1) {
int option;
- option = getopt_long(argc, argv, "a:fh", options, NULL);
+ option = getopt_long(argc, argv, "a:s:fh", options, NULL);
if (option == -1)
break;
- dbg("option '%c'", option);
+ dbg("option '%c'\n", option);
switch (option) {
case 'a':
action = optarg;
break;
+ case 's':
+ subsystem = optarg;
+ break;
case 'f':
force = 1;
break;
case 'h':
- printf("Usage: udevtest [--action=<string>] [--force] [--help] <devpath>\n"
- " --action=<string> set action string\n"
- " --force don't skip node/link creation\n"
- " --help print this help text\n\n");
+ printf("Usage: udevadm test OPTIONS <devpath>\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);
goto exit;
}
+ if (subsystem != NULL)
+ strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+
/* override built-in sysfs device */
udev->dev = dev;
- strcpy(udev->action, action);
+ strlcpy(udev->action, action, sizeof(udev->action));
udev->devt = udev_device_get_devt(udev);
/* simulate node creation with test flag */
setenv("ACTION", udev->action, 1);
import_uevent_var(udev->dev->devpath);
- info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
+ info("looking at device '%s' from subsystem '%s'\n", udev->dev->devpath, udev->dev->subsystem);
retval = udev_device_event(&rules, udev);
+
+ if (udev->event_timeout >= 0)
+ info("custom event timeout: %i\n", udev->event_timeout);
+
if (retval == 0 && !udev->ignore_device && udev_run) {
struct name_entry *name_loop;
strlcpy(program, name_loop->name, sizeof(program));
udev_rules_apply_format(udev, program, sizeof(program));
- info("run: '%s'", program);
+ info("run: '%s'\n", program);
}
}
+ udev_device_cleanup(udev);
exit:
udev_rules_cleanup(&rules);