config: Implement config messages

[petitboot] / discover / paths.c

diff --git a/discover/paths.c b/discover/paths.c
index b163e45063f5c0273dc8a86bb32bbc574dcb9d37..aa977fdba1f3d0bcbdbf84356a854877c202a17d 100644 (file)
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -1,5 +1,6 @@
 #define _GNU_SOURCE
 
+#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -79,9 +80,14 @@ static void load_url_process_exit(struct process *process)
        data = task->async_data;
        cb = task->async_cb;
 
-       result->status = process->exit_status == 0 ? LOAD_OK : LOAD_ERROR;
-       if (result->status == LOAD_ERROR)
+       if (result->status == LOAD_CANCELLED) {
                load_url_result_cleanup_local(result);
+       } else if (process->exit_status == 0) {
+               result->status = LOAD_OK;
+       } else {
+               result->status = LOAD_ERROR;
+               load_url_result_cleanup_local(result);
+       }
 
        /* The load callback may well free the ctx, which was the
         * talloc parent of the task. Therefore, we want to do our cleanup
@@ -89,6 +95,7 @@ static void load_url_process_exit(struct process *process)
         */
        process_release(process);
        talloc_free(task);
+       result->task = NULL;
 
        cb(result, data);
 }
@@ -313,6 +320,25 @@ static void load_wget(struct load_task *task, int flags)
        load_process_to_local_file(task, argv, 2);
 }
 
+/* Although we don't need to load anything for a local path (we just return
+ * the path from the file:// URL), the other load helpers will error-out on
+ * non-existant files. So, do the same here with an access() check on the local
+ * filename.
+ */
+static void load_local(struct load_task *task)
+{
+       int rc;
+
+       rc = access(task->url->path, F_OK);
+       if (rc) {
+               task->result->status = LOAD_ERROR;
+       } else {
+               task->result->local = talloc_strdup(task->result,
+                                                   task->url->path);
+               task->result->status = LOAD_OK;
+       }
+}
+
 /**
  * load_url - Loads a (possibly) remote URL and returns the local file
  * path.
@@ -340,6 +366,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
        task->url = url;
        task->async = async_cb != NULL;
        task->result = talloc_zero(ctx, struct load_url_result);
+       task->result->task = task;
        task->process = process_create(task);
        if (task->async) {
                task->async_cb = async_cb;
@@ -366,9 +393,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
                load_tftp(task);
                break;
        default:
-               task->result->local = talloc_strdup(task->result,
-                                                       url->path);
-               task->result->status = LOAD_OK;
+               load_local(task);
                break;
        }
 
@@ -390,3 +415,22 @@ struct load_url_result *load_url(void *ctx, struct pb_url *url)
 {
        return load_url_async(ctx, url, NULL, NULL);
 }
+
+void load_url_async_cancel(struct load_url_result *res)
+{
+       struct load_task *task = res->task;
+
+       /* the completion callback may have already been called; this clears
+        * res->task */
+       if (!task)
+               return;
+
+       if (res->status == LOAD_CANCELLED)
+               return;
+
+       assert(task->async);
+       assert(task->process);
+
+       res->status = LOAD_CANCELLED;
+       process_stop_async(task->process);
+}