chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path_id: suppress trailing '-' like 'ID_PATH=pci-0000:05:01.0-'
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index a36e503fd41112b339127022e04930f9943d181a..d5e90b02c650c05beab2499eedb90fc6853f9263 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-62,7
+62,7
@@
static int import_uevent_var(const char *devpath)
if (next == NULL)
goto out;
next[0] = '\0';
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];
}
putenv(key);
key = &next[1];
}
@@
-91,7
+91,7
@@
int udevtest(int argc, char *argv[], char *envp[])
{}
};
{}
};
- info("version %s", UDEV_VERSION);
+ info("version %s
\n
", UDEV_VERSION);
udev_config_init();
if (udev_log_priority < LOG_INFO) {
char priority[32];
udev_config_init();
if (udev_log_priority < LOG_INFO) {
char priority[32];
@@
-108,7
+108,7
@@
int udevtest(int argc, char *argv[], char *envp[])
if (option == -1)
break;
if (option == -1)
break;
- dbg("option '%c'", option);
+ dbg("option '%c'
\n
", option);
switch (option) {
case 'a':
action = optarg;
switch (option) {
case 'a':
action = optarg;
@@
-181,8
+181,12
@@
int udevtest(int argc, char *argv[], char *envp[])
setenv("ACTION", udev->action, 1);
import_uevent_var(udev->dev->devpath);
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);
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;
if (retval == 0 && !udev->ignore_device && udev_run) {
struct name_entry *name_loop;
@@
-191,7
+195,7
@@
int udevtest(int argc, char *argv[], char *envp[])
strlcpy(program, name_loop->name, sizeof(program));
udev_rules_apply_format(udev, program, sizeof(program));
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);
}
}
udev_device_cleanup(udev);