discover: Add device_{request,release}_write

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index 6896075ed1742b82b4e9306a5b1072556c8463df..48169167974d6150a2670aaba4576053e133da9e 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -22,30 +22,80 @@ struct p_item {
 STATIC_LIST(parsers);
 
 static char *local_path(struct discover_context *ctx,
+               struct discover_device *dev,
                const char *filename)
 {
-       return join_paths(ctx, ctx->device->mount_path, filename);
+       return join_paths(ctx, dev->mount_path, filename);
+}
+
+int parser_request_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char **buf, int *len)
+
+{
+       char *path;
+       int rc;
+
+       /* we only support local files at present */
+       if (!dev->mount_path)
+               return -1;
+
+       path = local_path(ctx, dev, filename);
+
+       rc = read_file(ctx, path, buf, len);
+
+       talloc_free(path);
+
+       return rc;
+}
+
+int parser_replace_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char *buf, int len)
+{
+       bool release;
+       char *path;
+       int rc;
+
+       if (!dev->mounted)
+               return -1;
+
+       rc = device_request_write(dev, &release);
+       if (rc) {
+               pb_log("Can't write file %s: device doesn't allow write\n",
+                               dev->device_path);
+               return -1;
+       }
+
+       path = local_path(ctx, dev, filename);
+
+       rc = replace_file(path, buf, len);
+
+       talloc_free(path);
+
+       device_release_write(dev, release);
+
+       return rc;
 }
 
 static int download_config(struct discover_context *ctx, char **buf, int *len)
 {
-       unsigned tempfile;
-       const char *file;
+       struct load_url_result *result;
        int rc;
 
-       file = load_url(ctx, ctx->conf_url, &tempfile);
-       if (!file)
+       result = load_url(ctx, ctx->conf_url);
+       if (!result)
                return -1;
 
-       rc = read_file(ctx, file, buf, len);
+       rc = read_file(ctx, result->local, buf, len);
        if (rc)
                goto out_clean;
 
        return 0;
 
 out_clean:
-       if (tempfile)
-               unlink(file);
+       if (result->cleanup_local)
+               unlink(result->local);
        return -1;
 }
 
@@ -62,7 +112,7 @@ static void iterate_parser_files(struct discover_context *ctx,
                int rc, len;
                char *buf;
 
-               path = local_path(ctx, *filename);
+               path = local_path(ctx, ctx->device, *filename);
                if (!path)
                        continue;
 
@@ -125,6 +175,8 @@ void __register_parser(struct parser *parser)
 {
        struct p_item* i = talloc(NULL, struct p_item);
 
+       printf("%s: %s\n", __func__, parser->name);
+
        i->parser = parser;
        list_add(&parsers, &i->list);
 }