X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=c83b5747ee0ded939f69df4bbe5976fe51f9be20;hp=56602d95d015b24b74c6976b60099993823ef745;hb=dbf139003bd6c8c6ca03ae7f533aa74afd8060c6;hpb=9793f862467407e83aa5b5a2cc35c25de9bae17b;ds=sidebyside

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 56602d9..c83b574 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -1,12 +1,100 @@
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
+#include <assert.h>
+#include <getopt.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <string.h>
+
+#include <waiter/waiter.h>
+#include <log/log.h>
 
 #include "udev.h"
+#include "user-event.h"
 #include "discover-server.h"
 #include "device-handler.h"
-#include "waiter.h"
-#include "log.h"
+
+static void print_version(void)
+{
+	printf("pb-discover (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
+}
+
+static void print_usage(void)
+{
+	print_version();
+	printf(
+"Usage: pb-discover [-h, --help] [-l, --log log-file] [-V, --version]\n");
+}
+
+/**
+ * enum opt_value - Tri-state options variables.
+ */
+
+enum opt_value {opt_undef = 0, opt_yes, opt_no};
+
+/**
+ * struct opts - Values from command line options.
+ */
+
+struct opts {
+	enum opt_value show_help;
+	const char *log_file;
+	enum opt_value show_version;
+	enum opt_value dry_run;
+};
+
+/**
+ * opts_parse - Parse the command line options.
+ */
+
+static int opts_parse(struct opts *opts, int argc, char *argv[])
+{
+	static const struct option long_options[] = {
+		{"help",           no_argument,       NULL, 'h'},
+		{"log",            required_argument, NULL, 'l'},
+		{"dry-run",        no_argument,       NULL, 'n'},
+		{"version",        no_argument,       NULL, 'V'},
+		{ NULL, 0, NULL, 0},
+	};
+	static const char short_options[] = "hl:nV";
+	static const struct opts default_values = {
+		.log_file = "/var/log/petitboot/pb-discover.log",
+		.dry_run = opt_no,
+	};
+
+	*opts = default_values;
+
+	while (1) {
+		int c = getopt_long(argc, argv, short_options, long_options,
+			NULL);
+
+		if (c == EOF)
+			break;
+
+		switch (c) {
+		case 'h':
+			opts->show_help = opt_yes;
+			break;
+		case 'l':
+			opts->log_file = optarg;
+			break;
+		case 'n':
+			opts->dry_run = opt_yes;
+			break;
+		case 'V':
+			opts->show_version = opt_yes;
+			break;
+		default:
+			opts->show_help = opt_yes;
+			return -1;
+		}
+	}
+
+	return optind != argc;
+}
 
 static int running;
 
@@ -15,38 +103,80 @@ static void sigint_handler(int __attribute__((unused)) signum)
 	running = 0;
 }
 
-int main(void)
+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;
+
+	if (opts_parse(&opts, argc, argv)) {
+		print_usage();
+		return EXIT_FAILURE;
+	}
+
+	if (opts.show_help == opt_yes) {
+		print_usage();
+		return EXIT_SUCCESS;
+	}
+
+	if (opts.show_version == opt_yes) {
+		print_version();
+		return EXIT_SUCCESS;
+	}
+
+	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);
+#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();
+	waitset = waitset_create(NULL);
+
+	server = discover_server_init(waitset);
 	if (!server)
 		return EXIT_FAILURE;
 
-	handler = device_handler_init(server);
+	handler = device_handler_init(server, opts.dry_run == opt_yes);
 	if (!handler)
 		return EXIT_FAILURE;
 
 	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(waitset, handler);
+	if (!uev)
+		return EXIT_FAILURE;
+
+	udev_trigger(udev);
+	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");
 
 	return EXIT_SUCCESS;
 }