X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Ftest-udev.c;h=75518f628d2cf3c082b04bf0f0f22faad6f577ce;hp=c6b8bf573ba774b7d7464906cff1a42f1935fca3;hb=86f77493bd48d8b95988a1f539b8b943a89757bf;hpb=065db052211d3bf08d9b0f698a79a8798faf11d2

diff --git a/udev/test-udev.c b/udev/test-udev.c
index c6b8bf573..75518f628 100644
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 	const char *action;
 	const char *subsystem;
 	struct sigaction act;
+	sigset_t mask;
 	int err = -EINVAL;
 
 	udev = udev_new();
@@ -68,6 +69,11 @@ int main(int argc, char *argv[])
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGALRM);
+	sigaddset(&mask, SIGINT);
+	sigaddset(&mask, SIGTERM);
+	sigprocmask(SIG_UNBLOCK, &mask, NULL);
 
 	/* trigger timeout to prevent hanging processes */
 	alarm(UDEV_EVENT_TIMEOUT);
@@ -102,8 +108,8 @@ int main(int argc, char *argv[])
 	if (udev_device_get_event_timeout(dev) >= 0)
 		alarm(udev_device_get_event_timeout(dev));
 
-	if (err == 0 && !event->ignore_device && udev_get_run(udev))
-		udev_event_execute_run(event);
+	if (err == 0 && udev_get_run(udev))
+		udev_event_execute_run(event, NULL);
 
 	udev_event_unref(event);
 	udev_device_unref(dev);