X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudevadm-monitor.c;h=7ef2e68233deaf0f75731017e7d9685af3235b65;hp=94e76da6fd2c0a6073bb27f1df40053f25f4e633;hb=d42688ef21a695f8a30b0d899dafdc6ff1ee0973;hpb=44433ebdb14d83750e0acdc4b3630b64f1fa18af
diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index 94e76da6f..7ef2e6823 100644
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -15,42 +15,33 @@
* along with this program. If not, see .
*/
-#include
#include
-#include
#include
#include
-#include
#include
#include
#include
#include
#include
-#include
-#include
#include
-#include
-#include
#include "udev.h"
#include "udev-util.h"
static bool udev_exit;
-static void sig_handler(int signum)
-{
+static void sig_handler(int signum) {
if (signum == SIGINT || signum == SIGTERM)
udev_exit = true;
}
-static void print_device(struct udev_device *device, const char *source, int prop)
-{
+static void print_device(struct udev_device *device, const char *source, int prop) {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
- printf("%-6s[%llu.%06u] %-8s %s (%s)\n",
+ printf("%-6s[%"PRI_TIME".%06ld] %-8s %s (%s)\n",
source,
- (unsigned long long) ts.tv_sec, (unsigned int) ts.tv_nsec/1000,
+ ts.tv_sec, ts.tv_nsec/1000,
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
@@ -66,17 +57,19 @@ static void print_device(struct udev_device *device, const char *source, int pro
}
static void help(void) {
- printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"
- " -p,--property print the event properties\n"
- " -k,--kernel print kernel uevents\n"
- " -u,--udev print udev events\n"
- " -s,--subsystem-match=SUBSYSTEM[/DEVTYPE] filter events by subsystem\n"
- " -t,--tag-match=TAG filter events by tag\n"
- " -h,--help\n\n");
+ printf("%s monitor [--property] [--kernel] [--udev] [--help]\n\n"
+ "Listen to kernel and udev events.\n\n"
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ " -p --property Print the event properties\n"
+ " -k --kernel Print kernel uevents\n"
+ " -u --udev Print udev events\n"
+ " -s --subsystem-match=SUBSYSTEM[/DEVTYPE] Filter events by subsystem\n"
+ " -t --tag-match=TAG Filter events by tag\n"
+ , program_invocation_short_name);
}
-static int adm_monitor(struct udev *udev, int argc, char *argv[])
-{
+static int adm_monitor(struct udev *udev, int argc, char *argv[]) {
struct sigaction act = {};
sigset_t mask;
bool prop = false;
@@ -158,7 +151,7 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- log_error("error creating epoll fd: %m\n");
+ log_error_errno(errno, "error creating epoll fd: %m");
return 1;
}
@@ -194,11 +187,11 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
return 2;
}
- memset(&ep_udev, 0, sizeof(struct epoll_event));
+ memzero(&ep_udev, sizeof(struct epoll_event));
ep_udev.events = EPOLLIN;
ep_udev.data.fd = fd_udev;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) {
- log_error("fail to add fd to epoll: %m\n");
+ log_error_errno(errno, "fail to add fd to epoll: %m");
return 2;
}
@@ -228,11 +221,11 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
return 4;
}
- memset(&ep_kernel, 0, sizeof(struct epoll_event));
+ memzero(&ep_kernel, sizeof(struct epoll_event));
ep_kernel.events = EPOLLIN;
ep_kernel.data.fd = fd_kernel;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_kernel, &ep_kernel) < 0) {
- log_error("fail to add fd to epoll: %m\n");
+ log_error_errno(errno, "fail to add fd to epoll: %m");
return 5;
}
@@ -279,5 +272,5 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
const struct udevadm_cmd udevadm_monitor = {
.name = "monitor",
.cmd = adm_monitor,
- .help = "listen to kernel and udev events",
+ .help = "Listen to kernel and udev events",
};