chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] update RELEASE-NOTES
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 006d55510e3aa1b84e6e189b5d0b9ec343361502..93387f76d0b9d8e462a7b1b8a50c3e966353a979 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-26,6
+26,7
@@
#include <errno.h>
#include <ctype.h>
#include <signal.h>
#include <errno.h>
#include <ctype.h>
#include <signal.h>
+#include <syslog.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
@@
-37,10
+38,13
@@
#ifdef USE_LOG
#ifdef USE_LOG
-void log_message (int
level
, const char *format, ...)
+void log_message (int
priority
, const char *format, ...)
{
va_list args;
{
va_list args;
+ if (priority > udev_log_priority)
+ return;
+
va_start(args, format);
vprintf(format, args);
va_end(args);
va_start(args, format);
vprintf(format, args);
va_end(args);
@@
-60,13
+64,15
@@
int main(int argc, char *argv[], char *envp[])
info("version %s", UDEV_VERSION);
info("version %s", UDEV_VERSION);
- if (argc < 2 || argc > 3) {
- info("Usage: udevtest <devpath> [subsystem]");
- return 1;
- }
-
/* initialize our configuration */
udev_init_config();
/* initialize our configuration */
udev_init_config();
+ if (udev_log_priority < LOG_INFO)
+ udev_log_priority = LOG_INFO;
+
+ if (argc != 3) {
+ info("Usage: udevtest <devpath> <subsystem>");
+ return 1;
+ }
/* remove sysfs_path if given */
if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
/* remove sysfs_path if given */
if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
@@
-80,16
+86,17
@@
int main(int argc, char *argv[], char *envp[])
} else
devpath = argv[1];
} else
devpath = argv[1];
- info("looking at '%s'", devpath);
+ subsystem = argv[2];
+ setenv("DEVPATH", devpath, 1);
+ setenv("SUBSYSTEM", subsystem, 1);
+ setenv("ACTION", "add", 1);
+ info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
/* initialize the naming deamon */
udev_rules_init();
/* initialize the naming deamon */
udev_rules_init();
- if (argc == 3)
- subsystem = argv[2];
-
/* fill in values and test_run flag*/
/* fill in values and test_run flag*/
- udev_init_device(&udev, devpath, subsystem);
+ udev_init_device(&udev, devpath, subsystem
, "add"
);
/* skip subsystems without "dev", but handle net devices */
if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
/* skip subsystems without "dev", but handle net devices */
if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {