X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=2b04e62ee0247ab95d153325c9d3f2f865ca28bb;hp=d2ea7ae1e7b075691e708d4b72f8d94a6557050a;hb=47a9f94bb346817b6767d5dac578a43beee47c1f;hpb=aff253f850e7391afc82d339c0e51ce31e87f307

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index d2ea7ae..2b04e62 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -1,22 +1,43 @@
 
+#include <assert.h>
 #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)
 {
 	struct device_handler *handler;
 	struct discover_server *server;
 	struct udev *udev;
+	FILE *log;
+
+	log = fopen("pb-discover.log", "a");
+	assert(log);
+	pb_log_set_stream(log);
+
+#if defined(DEBUG)
+	pb_log_always_flush(1);
+#endif
+	pb_log("--- pb-discover ---\n");
 
 	/* 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 +52,14 @@ int main(void)
 	if (!udev)
 		return EXIT_FAILURE;
 
-	for (;;) {
+	for (running = 1; running;) {
 		if (waiter_poll())
-			return EXIT_FAILURE;
+			break;
 	}
 
+	device_handler_destroy(handler);
+
+	pb_log("--- end ---\n");
 
 	return EXIT_SUCCESS;
 }