X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=c494eeb31ba5e595a15b7df387270c6e1d7b1781;hp=4d618147f15c8e1a18a4ec6a900dd92c240ba2b7;hb=8f09986340e602a69398b2866a265ea3f16609c6;hpb=7eb1d21503768c849e2d4b8c455a182d82cdc966

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 4d61814..c494eeb 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -1,14 +1,117 @@
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <assert.h>
+#include <getopt.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <locale.h>
+#include <string.h>
 
 #include <waiter/waiter.h>
 #include <log/log.h>
+#include <process/process.h>
+#include <talloc/talloc.h>
+#include <i18n/i18n.h>
 
-#include "udev.h"
 #include "discover-server.h"
 #include "device-handler.h"
+#include "sysinfo.h"
+#include "platform.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 [-a, --no-autoboot] [-h, --help] [-l, --log log-file]\n"
+"                   [-n, --dry-run] [-v, --verbose] [-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 no_autoboot;
+	enum opt_value show_help;
+	const char *log_file;
+	enum opt_value dry_run;
+	enum opt_value show_version;
+	enum opt_value verbose;
+};
+
+/**
+ * opts_parse - Parse the command line options.
+ */
+
+static int opts_parse(struct opts *opts, int argc, char *argv[])
+{
+	static const struct option long_options[] = {
+		{"no-autoboot",    no_argument,       NULL, 'a'},
+		{"help",           no_argument,       NULL, 'h'},
+		{"log",            required_argument, NULL, 'l'},
+		{"dry-run",        no_argument,       NULL, 'n'},
+		{"verbose",        no_argument,       NULL, 'v'},
+		{"version",        no_argument,       NULL, 'V'},
+		{ NULL, 0, NULL, 0},
+	};
+	static const char short_options[] = "ahl:nvV";
+	static const struct opts default_values = {
+		.no_autoboot = opt_no,
+		.log_file = "/var/log/petitboot/pb-discover.log",
+		.dry_run = opt_no,
+		.verbose = 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 'a':
+			opts->no_autoboot = opt_yes;
+			break;
+		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->verbose = 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;
 
@@ -17,20 +120,48 @@ 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 udev *udev;
+	struct waitset *waitset;
+	struct procset *procset;
+	struct opts opts;
 	FILE *log;
 
-	log = fopen("pb-discover.log", "a");
-	assert(log);
-	pb_log_set_stream(log);
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	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;
+	}
+
+	log = stderr;
+	if (strcmp(opts.log_file, "-")) {
+		log = fopen(opts.log_file, "a");
+		if (!log) {
+			fprintf(stderr, "can't open log file %s, logging to "
+					"stderr\n", opts.log_file);
+			log = stderr;
+		}
+	}
+	pb_log_init(log);
+
+	if (opts.verbose == opt_yes)
+		pb_log_set_debug(true);
 
-#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 */
@@ -38,30 +169,48 @@ int main(void)
 
 	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);
-	if (!handler)
+	procset = process_init(server, waitset, opts.dry_run == opt_yes);
+	if (!procset)
 		return EXIT_FAILURE;
 
-	discover_server_set_device_source(server, handler);
+	platform_init(NULL);
+	if (opts.no_autoboot == opt_yes)
+		config_set_autoboot(false);
+
+	if (config_get()->lang)
+		setlocale(LC_ALL, config_get()->lang);
 
-	udev = udev_init(handler);
-	if (!udev)
+	if (config_get()->debug)
+		pb_log_set_debug(true);
+
+	system_info_init(server);
+
+	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
+	if (!handler)
 		return EXIT_FAILURE;
 
-	udev_trigger(udev);
+	discover_server_set_device_source(server, handler);
 
 	for (running = 1; running;) {
-		if (waiter_poll())
+		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
+	discover_server_destroy(server);
+	platform_fini();
+	talloc_free(waitset);
 
 	pb_log("--- end ---\n");
 
+	if (log != stderr)
+		fclose(log);
+
 	return EXIT_SUCCESS;
 }