X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevmonitor.c;h=33dff2a13c3e7e8fa9947d904ba5493d9e593a9c;hp=2775b295ceac9bc18e709d77e6660dce23655612;hb=b2c6818dc35f7b149bba7bf963d1a3afb8daa867;hpb=24a12dcbb81e364723cee065d7471b4d03a9db86

diff --git a/udevmonitor.c b/udevmonitor.c
index 2775b295c..33dff2a13 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
@@ -38,6 +39,7 @@
 
 static int uevent_netlink_sock;
 static int udev_monitor_sock;
+static volatile int udev_exit;
 
 static int init_udev_monitor_socket(void)
 {
@@ -63,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;
 	}
 
@@ -100,8 +103,15 @@ 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;
 	fd_set readfds;
 	int i;
@@ -125,18 +135,28 @@ int main(int argc, char *argv[])
 
 	if (getuid() != 0) {
 		fprintf(stderr, "need to be root, exit\n\n");
-		exit(1);
+		exit(2);
 	}
 
+	/* 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;
-	init_uevent_netlink_sock();
+	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 (1) {
+	while (!udev_exit) {
 		static char buf[UEVENT_BUFFER_SIZE*2];
 		ssize_t buflen;
 		int fdcount;
@@ -204,5 +224,7 @@ out:
 	if (udev_monitor_sock > 0)
 		close(udev_monitor_sock);
 
-	return retval;
+	if (retval)
+		return 3;
+	return 0;
 }