chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use libudev code, unify logging, pass udev context around everywhere
[elogind.git]
/
udev
/
udevadm-monitor.c
diff --git
a/udev/udevadm-monitor.c
b/udev/udevadm-monitor.c
index a45f165cfe95fedc2af433861dbe1d97bceec978..0b9b8118097c17c546fa26df19b50f2fb4e8dde8 100644
(file)
--- a/
udev/udevadm-monitor.c
+++ b/
udev/udevadm-monitor.c
@@
-123,13
+123,13
@@
static const char *search_key(const char *searchkey, const char *buf, size_t buf
return NULL;
}
return NULL;
}
-int udevadm_monitor(int argc, char *argv[])
+int udevadm_monitor(
struct udev *udev,
int argc, char *argv[])
{
struct sigaction act;
int option;
int env = 0;
{
struct sigaction act;
int option;
int env = 0;
- int kernel = 0;
- int udev = 0;
+ int
print_
kernel = 0;
+ int
print_
udev = 0;
fd_set readfds;
int retval = 0;
fd_set readfds;
int retval = 0;
@@
-151,10
+151,10
@@
int udevadm_monitor(int argc, char *argv[])
env = 1;
break;
case 'k':
env = 1;
break;
case 'k':
- kernel = 1;
+
print_
kernel = 1;
break;
case 'u':
break;
case 'u':
- udev = 1;
+
print_
udev = 1;
break;
case 'h':
printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
break;
case 'h':
printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
@@
-167,12
+167,12
@@
int udevadm_monitor(int argc, char *argv[])
}
}
}
}
- if (!
kernel && !
udev) {
- kernel = 1;
- udev =1;
+ if (!
print_kernel && !print_
udev) {
+
print_
kernel = 1;
+
print_
udev =1;
}
}
- if (getuid() != 0 && kernel) {
+ if (getuid() != 0 &&
print_
kernel) {
fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
goto out;
}
fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
goto out;
}
@@
-185,14
+185,14
@@
int udevadm_monitor(int argc, char *argv[])
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
- printf("
udev
monitor will print the received events for:\n");
- if (udev) {
+ printf("monitor will print the received events for:\n");
+ if (
print_
udev) {
retval = init_udev_monitor_socket();
if (retval)
goto out;
printf("UDEV the event which udev sends out after rule processing\n");
}
retval = init_udev_monitor_socket();
if (retval)
goto out;
printf("UDEV the event which udev sends out after rule processing\n");
}
- if (kernel) {
+ if (
print_
kernel) {
retval = init_uevent_netlink_sock();
if (retval)
goto out;
retval = init_uevent_netlink_sock();
if (retval)
goto out;