discover: log unresolved boot options

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 45b6ba1c7207c62a870a73fe3d22c317bf418326..9330da6129e7ad6165fe29fb3899d897804a228f 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -1,34 +1,182 @@
 
+#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 "waiter.h"
-#include "log.h"
+#include "device-handler.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;
 
+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 opts opts;
+       struct pb_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);
 
-       udev = udev_init();
+       signal(SIGINT, sigint_handler);
+
+       waitset = waitset_create(NULL);
+
+       server = discover_server_init(waitset);
+       if (!server)
+               return EXIT_FAILURE;
+
+       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(waitset, handler);
        if (!udev)
                return EXIT_FAILURE;
 
-       server = discover_server_init();
-       if (!server)
+       uev = user_event_init(waitset, handler);
+       if (!uev)
                return EXIT_FAILURE;
 
-       for (;;) {
-               if (waiter_poll())
-                       return EXIT_FAILURE;
+       user_event_trigger(uev);
+
+       for (running = 1; running;) {
+               if (waiter_poll(waitset))
+                       break;
        }
 
+       device_handler_destroy(handler);
+       waitset_destroy(waitset);
+       udev_destroy(udev);
+
+       pb_log("--- end ---\n");
 
        return EXIT_SUCCESS;
 }