discover: remove register_parser printf

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index e2940e19e1b939a3aaaaf2dca45b28d8a02e418b..b0668808cd859cfe7706ad5df870005878639a4e 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -12,6 +12,7 @@
 #include "parser.h"
 #include "parser-utils.h"
 #include "paths.h"
+#include "file.h"
 
 struct p_item {
        struct list_item list;
@@ -20,84 +21,81 @@ struct p_item {
 
 STATIC_LIST(parsers);
 
-static const int max_file_size = 1024 * 1024;
+static char *local_path(struct discover_context *ctx,
+               struct discover_device *dev,
+               const char *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)
 
-static int read_file(struct discover_context *ctx,
-               const char *filename, char **bufp, int *lenp)
 {
-       struct stat statbuf;
-       int rc, fd, i, len;
-       char *buf;
+       char *path;
+       int rc;
 
-       fd = open(filename, O_RDONLY);
-       if (fd < 0)
+       /* we only support local files at present */
+       if (!dev->mount_path)
                return -1;
 
-       rc = fstat(fd, &statbuf);
-       if (rc < 0)
-               goto err_close;
+       path = local_path(ctx, dev, filename);
 
-       len = statbuf.st_size;
-       if (len > max_file_size)
-               goto err_close;
+       rc = read_file(ctx, path, buf, len);
 
-       buf = talloc_array(ctx, char, len + 1);
-       if (!buf)
-               goto err_close;
+       talloc_free(path);
 
-       for (i = 0; i < len; i += rc) {
-               rc = read(fd, buf + i, len - i);
+       return rc;
+}
 
-               /* unexpected EOF: trim and return */
-               if (rc == 0) {
-                       len = i;
-                       break;
-               }
+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 (rc < 0)
-                       goto err_free;
+       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;
        }
 
-       buf[len] = '\0';
+       path = local_path(ctx, dev, filename);
 
-       close(fd);
-       *bufp = buf;
-       *lenp = len;
-       return 0;
+       rc = replace_file(path, buf, len);
 
-err_free:
-       talloc_free(buf);
-err_close:
-       close(fd);
-       return -1;
-}
+       talloc_free(path);
 
-static char *local_path(struct discover_context *ctx,
-               const char *filename)
-{
-       return join_paths(ctx, ctx->device->mount_path, filename);
+       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;
 }
 
@@ -114,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;