Move waiter to library

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index d2ea7ae1e7b075691e708d4b72f8d94a6557050a..d11ab648b745fa2a20ab6b96b92e16988de82594 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -2,12 +2,20 @@
 #include <stdlib.h>
 #include <signal.h>
 
+#include <waiter/waiter.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)
 {
        struct device_handler *handler;
@@ -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;
@@ -31,11 +41,13 @@ int main(void)
        if (!udev)
                return EXIT_FAILURE;
 
-       for (;;) {
+       for (running = 1; running;) {
                if (waiter_poll())
-                       return EXIT_FAILURE;
+                       break;
        }
 
+       device_handler_destroy(handler);
+
 
        return EXIT_SUCCESS;
 }