discover: Initialise strtok_r saveptr to NULL

[petitboot] / discover / boot.c

diff --git a/discover/boot.c b/discover/boot.c
index 13dfe0c9781fc5be889e48e34340cbb4e952aecd..7778b3fd02bc21f588e260e08cb888d20b4a266a 100644 (file)
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -1,5 +1,7 @@
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -16,6 +18,7 @@
 #include <talloc/talloc.h>
 #include <url/url.h>
 #include <util/util.h>
+#include <i18n/i18n.h>
 
 #include "device-handler.h"
 #include "boot.h"
@@ -32,6 +35,9 @@ struct boot_task {
        struct load_url_result *image;
        struct load_url_result *initrd;
        struct load_url_result *dtb;
+       const char *local_image;
+       const char *local_initrd;
+       const char *local_dtb;
        const char *args;
        boot_status_fn status_fn;
        void *status_arg;
@@ -55,16 +61,16 @@ static int kexec_load(struct boot_task *boot_task)
        *p++ = pb_system_apps.kexec;    /* 1 */
        *p++ = "-l";                    /* 2 */
 
-       if (boot_task->initrd) {
+       if (boot_task->local_initrd) {
                s_initrd = talloc_asprintf(boot_task, "--initrd=%s",
-                               boot_task->initrd->local);
+                               boot_task->local_initrd);
                assert(s_initrd);
                *p++ = s_initrd;         /* 3 */
        }
 
-       if (boot_task->dtb) {
+       if (boot_task->local_dtb) {
                s_dtb = talloc_asprintf(boot_task, "--dtb=%s",
-                                               boot_task->dtb->local);
+                                               boot_task->local_dtb);
                assert(s_dtb);
                *p++ = s_dtb;            /* 4 */
        }
@@ -76,7 +82,7 @@ static int kexec_load(struct boot_task *boot_task)
                *p++ = s_args;          /* 5 */
        }
 
-       *p++ = boot_task->image->local; /* 6 */
+       *p++ = boot_task->local_image;  /* 6 */
        *p++ = NULL;                    /* 7 */
 
        result = process_run_simple_argv(boot_task, argv);
@@ -151,9 +157,9 @@ static void boot_hook_update_param(void *ctx, struct boot_task *task,
                const char *name;
                const char **p;
        } *param, params[] = {
-               { "boot_image",         &task->image->local },
-               { "boot_initrd",        &task->initrd->local },
-               { "boot_dtb",           &task->dtb->local },
+               { "boot_image",         &task->local_image },
+               { "boot_initrd",        &task->local_initrd },
+               { "boot_dtb",           &task->local_dtb },
                { "boot_args",          &task->args },
                { NULL, NULL },
        };
@@ -171,7 +177,7 @@ static void boot_hook_update(struct boot_task *task, const char *hookname,
                char *buf)
 {
        char *line, *name, *val, *sep;
-       char *saveptr;
+       char *saveptr = NULL;
 
        for (;; buf = NULL) {
 
@@ -201,11 +207,11 @@ static void boot_hook_setenv(struct boot_task *task)
        unsetenv("boot_dtb");
        unsetenv("boot_args");
 
-       setenv("boot_image", task->image->local, 1);
-       if (task->initrd)
-               setenv("boot_initrd", task->initrd->local, 1);
-       if (task->dtb)
-               setenv("boot_dtb", task->dtb->local, 1);
+       setenv("boot_image", task->local_image, 1);
+       if (task->local_initrd)
+               setenv("boot_initrd", task->local_initrd, 1);
+       if (task->local_dtb)
+               setenv("boot_dtb", task->local_dtb, 1);
        if (task->args)
                setenv("boot_args", task->args, 1);
 }
@@ -230,7 +236,7 @@ static void run_boot_hooks(struct boot_task *task)
                return;
 
        update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-                       "running boot hooks");
+                       _("running boot hooks"));
 
        boot_hook_setenv(task);
 
@@ -266,11 +272,9 @@ static void run_boot_hooks(struct boot_task *task)
                        /* if the hook returned with BOOT_HOOK_EXIT_UPDATE,
                         * then we process stdout to look for updated params
                         */
-                       if (rc == BOOT_HOOK_EXIT_UPDATE) {
-                               boot_hook_update(task, hooks[i]->d_name,
-                                               process->stdout_buf);
-                               boot_hook_setenv(task);
-                       }
+                       boot_hook_update(task, hooks[i]->d_name,
+                                       process->stdout_buf);
+                       boot_hook_setenv(task);
                }
 
                process_release(process);
@@ -295,7 +299,7 @@ static int check_load(struct boot_task *task, const char *name,
 
        update_status(task->status_fn, task->status_arg,
                        BOOT_STATUS_ERROR,
-                       "Couldn't load %s", name);
+                       _("Couldn't load %s"), name);
        return -1;
 }
 
@@ -337,6 +341,11 @@ static void cleanup_cancellations(struct boot_task *task,
                } else if (result->status == LOAD_ASYNC) {
                        load_url_async_cancel(result);
                        pending = true;
+
+               /* if we're waiting for a cancellation, we still need to
+                * wait for the completion before freeing the boot task */
+               } else if (result->status == LOAD_CANCELLED) {
+                       pending = true;
                }
        }
 
@@ -364,15 +373,21 @@ static void boot_process(struct load_url_result *result, void *data)
                        check_load(task, "dtb", task->dtb))
                goto no_load;
 
+       /* we make a copy of the local paths, as the boot hooks might update
+        * and/or create these */
+       task->local_image = task->image ? task->image->local : NULL;
+       task->local_initrd = task->initrd ? task->initrd->local : NULL;
+       task->local_dtb = task->dtb ? task->dtb->local : NULL;
+
        run_boot_hooks(task);
 
        update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-                       "performing kexec_load");
+                       _("performing kexec_load"));
 
        rc = kexec_load(task);
        if (rc) {
                update_status(task->status_fn, task->status_arg,
-                               BOOT_STATUS_ERROR, "kexec load failed");
+                               BOOT_STATUS_ERROR, _("kexec load failed"));
        }
 
 no_load:
@@ -383,13 +398,13 @@ no_load:
        if (!rc) {
                update_status(task->status_fn, task->status_arg,
                                BOOT_STATUS_INFO,
-                               "performing kexec reboot");
+                               _("performing kexec reboot"));
 
                rc = kexec_reboot(task);
                if (rc) {
                        update_status(task->status_fn, task->status_arg,
                                        BOOT_STATUS_ERROR,
-                                       "kexec reboot failed");
+                                       _("kexec reboot failed"));
                }
        }
 }
@@ -404,7 +419,7 @@ static int start_url_load(struct boot_task *task, const char *name,
        if (!*result) {
                update_status(task->status_fn, task->status_arg,
                                BOOT_STATUS_ERROR,
-                               "Error loading %s", name);
+                               _("Error loading %s"), name);
                return -1;
        }
        return 0;
@@ -424,10 +439,10 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        else if (cmd && cmd->boot_image_file)
                boot_desc = cmd->boot_image_file;
        else
-               boot_desc = "(unknown)";
+               boot_desc = _("(unknown)");
 
        update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                       "Booting %s.", boot_desc);
+                       _("Booting %s."), boot_desc);
 
        if (cmd && cmd->boot_image_file) {
                image = pb_url_parse(opt, cmd->boot_image_file);
@@ -436,7 +451,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        } else {
                pb_log("%s: no image specified\n", __func__);
                update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                               "Boot failed: no image specified");
+                               _("Boot failed: no image specified"));
                return NULL;
        }
 
@@ -487,7 +502,7 @@ void boot_cancel(struct boot_task *task)
        task->cancelled = true;
 
        update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-                       "Boot cancelled");
+                       _("Boot cancelled"));
 
        cleanup_cancellations(task, NULL);
 }