X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevmonitor.c;h=33dff2a13c3e7e8fa9947d904ba5493d9e593a9c;hp=51e8a2ab0b52fa343743e43a6c41a8a2d92410cb;hb=7b4f33ce60246ad1ba518cf054ec3322ea6f9954;hpb=47e353f9b9c1a95d4e7cdf0e9be3d746585851f1

diff --git a/udevmonitor.c b/udevmonitor.c
index 51e8a2ab0..33dff2a13 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -25,18 +25,21 @@
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
+#include <linux/types.h>
 #include <linux/netlink.h>
-#include <asm/types.h>
 
 #include "udev.h"
 #include "udevd.h"
+#include "udev_utils.h"
 #include "udev_libc_wrapper.h"
 
 static int uevent_netlink_sock;
 static int udev_monitor_sock;
+static volatile int udev_exit;
 
 static int init_udev_monitor_socket(void)
 {
@@ -62,6 +65,7 @@ static int init_udev_monitor_socket(void)
 	if (retval < 0) {
 		fprintf(stderr, "bind failed, %s\n", strerror(errno));
 		close(udev_monitor_sock);
+		udev_monitor_sock = -1;
 		return -1;
 	}
 
@@ -99,45 +103,79 @@ static int init_uevent_netlink_sock(void)
 	return 0;
 }
 
+static void asmlinkage sig_handler(int signum)
+{
+	if (signum == SIGINT || signum == SIGTERM)
+		udev_exit = 1;
+}
+
 int main(int argc, char *argv[])
 {
+	struct sigaction act;
 	int env = 0;
-	int maxsockplus;
 	fd_set readfds;
-	int retval;
+	int i;
+	int retval = 0;
 
-	if (getuid() != 0) {
-		printf("need to be root, exit\n");
-		exit(1);
+	for (i = 1 ; i < argc; i++) {
+		char *arg = argv[i];
+		if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) {
+			env = 1;
+		}
+		else if (strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0){
+			printf("Usage: udevmonitor [--env]\n"
+				"  --env    print the whole event environment\n"
+				"  --help   print this help text\n\n");
+			exit(0);
+		} else {
+			fprintf(stderr, "unknown option\n\n");
+			exit(1);
+		}
 	}
 
-	if (argc == 2 && strstr(argv[1], "--env"))
-		env = 1;
-
-	init_uevent_netlink_sock();
-	init_udev_monitor_socket();
-
-	FD_ZERO(&readfds);
-	FD_SET(uevent_netlink_sock, &readfds);
-	FD_SET(udev_monitor_sock, &readfds);
-	maxsockplus = udev_monitor_sock+1;
+	if (getuid() != 0) {
+		fprintf(stderr, "need to be root, exit\n\n");
+		exit(2);
+	}
 
-	while (1) {
+	/* set signal handlers */
+	memset(&act, 0x00, sizeof(struct sigaction));
+	act.sa_handler = (void (*)(int)) sig_handler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
+
+	retval = init_udev_monitor_socket();
+	if (retval)
+		goto out;
+	retval = init_uevent_netlink_sock();
+	if (retval)
+		goto out;
+
+	printf("udevmonitor prints the received event from the kernel [UEVENT]\n"
+	       "and the event which udev sends out after rule processing [UDEV]\n\n");
+
+	while (!udev_exit) {
 		static char buf[UEVENT_BUFFER_SIZE*2];
 		ssize_t buflen;
-		fd_set workreadfds;
+		int fdcount;
 
 		buflen = 0;
-		workreadfds = readfds;
-
-		retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
-		if (retval < 0) {
+		FD_ZERO(&readfds);
+		if (uevent_netlink_sock > 0)
+			FD_SET(uevent_netlink_sock, &readfds);
+		if (udev_monitor_sock > 0)
+			FD_SET(udev_monitor_sock, &readfds);
+
+		fdcount = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &readfds, NULL, NULL, NULL);
+		if (fdcount < 0) {
 			if (errno != EINTR)
 				fprintf(stderr, "error receiving uevent message\n");
 			continue;
 		}
 
-		if (FD_ISSET(uevent_netlink_sock, &workreadfds)) {
+		if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
 			buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
 			if (buflen <=  0) {
 				fprintf(stderr, "error receiving uevent message\n");
@@ -146,7 +184,7 @@ int main(int argc, char *argv[])
 			printf("UEVENT[%i] %s\n", time(NULL), buf);
 		}
 
-		if (FD_ISSET(udev_monitor_sock, &workreadfds)) {
+		if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
 			buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
 			if (buflen <=  0) {
 				fprintf(stderr, "error receiving udev message\n");
@@ -180,7 +218,13 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	close(uevent_netlink_sock);
-	close(udev_monitor_sock);
-	exit(1);
+out:
+	if (uevent_netlink_sock > 0)
+		close(uevent_netlink_sock);
+	if (udev_monitor_sock > 0)
+		close(udev_monitor_sock);
+
+	if (retval)
+		return 3;
+	return 0;
 }