X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=536f6e65a7b34a88a916417f553eb7414a5773f3;hp=fa1c28ec75ca169f0690740d9358d4a394eff9b2;hb=01ed80939b8ed440390729c524ad875047dbd406;hpb=ae0ba68f475ae5b057aad6538765bc8702134b9a

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index fa1c28e..536f6e6 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -7,6 +7,7 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <string.h>
 
 #include <waiter/waiter.h>
 #include <log/log.h>
@@ -100,10 +101,10 @@ int main(int argc, char *argv[])
 {
 	struct device_handler *handler;
 	struct discover_server *server;
+	struct waitset *waitset;
 	struct opts opts;
 	struct udev *udev;
 	struct user_event *uev;
-	FILE *log;
 
 	if (opts_parse(&opts, argc, argv)) {
 		print_usage();
@@ -120,9 +121,13 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
-	log = fopen(opts.log_file, "a");
-	assert(log);
-	pb_log_set_stream(log);
+	if (strcmp(opts.log_file, "-")) {
+		FILE *log = fopen(opts.log_file, "a");
+
+		assert(log);
+		pb_log_set_stream(log);
+	} else
+		pb_log_set_stream(stderr);
 
 #if defined(DEBUG)
 	pb_log_always_flush(1);
@@ -134,7 +139,9 @@ int main(int argc, char *argv[])
 
 	signal(SIGINT, sigint_handler);
 
-	server = discover_server_init();
+	waitset = waitset_create(NULL);
+
+	server = discover_server_init(waitset);
 	if (!server)
 		return EXIT_FAILURE;
 
@@ -144,11 +151,11 @@ int main(int argc, char *argv[])
 
 	discover_server_set_device_source(server, handler);
 
-	udev = udev_init(handler);
+	udev = udev_init(waitset, handler);
 	if (!udev)
 		return EXIT_FAILURE;
 
-	uev = user_event_init(handler);
+	uev = user_event_init(waitset, handler);
 	if (!uev)
 		return EXIT_FAILURE;
 
@@ -156,11 +163,12 @@ int main(int argc, char *argv[])
 	user_event_trigger(uev);
 
 	for (running = 1; running;) {
-		if (waiter_poll())
+		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
+	waitset_destroy(waitset);
 
 	pb_log("--- end ---\n");