chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: clean up linux_raid code
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 418d43de14369a999c2423af5d13cad5727accb2..d5e90b02c650c05beab2499eedb90fc6853f9263 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-32,22
+32,6
@@
#include "udev.h"
#include "udev_rules.h"
#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);
- printf("\n");
-}
-#endif
-
static int import_uevent_var(const char *devpath)
{
char path[PATH_SIZE];
static int import_uevent_var(const char *devpath)
{
char path[PATH_SIZE];
@@
-78,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];
}
@@
-87,12
+71,12
@@
out:
return rc;
}
return rc;
}
-int
main
(int argc, char *argv[], char *envp[])
+int
udevtest
(int argc, char *argv[], char *envp[])
{
int force = 0;
{
int force = 0;
- char *action = "add";
- char *subsystem = NULL;
- char *devpath = NULL;
+ c
onst c
har *action = "add";
+ c
onst c
har *subsystem = NULL;
+ c
onst c
har *devpath = NULL;
struct udevice *udev;
struct sysfs_device *dev;
struct udev_rules rules = {};
struct udevice *udev;
struct sysfs_device *dev;
struct udev_rules rules = {};
@@
-107,7
+91,7
@@
int main(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];
@@
-124,7
+108,7
@@
int main(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;
@@
-136,7
+120,7
@@
int main(int argc, char *argv[], char *envp[])
force = 1;
break;
case 'h':
force = 1;
break;
case 'h':
- printf("Usage: udevtest OPTIONS <devpath>\n"
+ printf("Usage: udev
adm
test OPTIONS <devpath>\n"
" --action=<string> set action string\n"
" --subsystem=<string> set subsystem string\n"
" --force don't skip node/link creation\n"
" --action=<string> set action string\n"
" --subsystem=<string> set subsystem string\n"
" --force don't skip node/link creation\n"
@@
-197,8
+181,12
@@
int main(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;
@@
-207,7
+195,7
@@
int main(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);