Make device instance constant

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 63aaf0089543965a228849dcdccadceaa16c02fe..d8709b3974693f8657a61709e032486ec2ead08e 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -2,11 +2,19 @@
 #include <stdlib.h>
 #include <signal.h>
 
+#include <waiter/waiter.h>
+#include <log/log.h>
+
 #include "udev.h"
 #include "discover-server.h"
 #include "device-handler.h"
-#include "waiter.h"
-#include "log.h"
+
+static int running;
+
+static void sigint_handler(int __attribute__((unused)) signum)
+{
+       running = 0;
+}
 
 int main(void)
 {
@@ -17,6 +25,8 @@ int main(void)
        /* we look for closed sockets when we write, so ignore SIGPIPE */
        signal(SIGPIPE, SIG_IGN);
 
+       signal(SIGINT, sigint_handler);
+
        server = discover_server_init();
        if (!server)
                return EXIT_FAILURE;
@@ -27,15 +37,17 @@ int main(void)
 
        discover_server_set_device_source(server, handler);
 
-       udev = udev_init();
+       udev = udev_init(handler);
        if (!udev)
                return EXIT_FAILURE;
 
-       for (;;) {
+       for (running = 1; running;) {
                if (waiter_poll())
-                       return EXIT_FAILURE;
+                       break;
        }
 
+       device_handler_destroy(handler);
+
 
        return EXIT_SUCCESS;
 }