discover/resource: create_url_resource should take ownership of url

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index e2940e19e1b939a3aaaaf2dca45b28d8a02e418b..a304f0c989e32f4e124d1f62647547b067d952b5 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,59 +21,6 @@ struct p_item {
 
 STATIC_LIST(parsers);
 
-static const int max_file_size = 1024 * 1024;
-
-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;
-
-       fd = open(filename, O_RDONLY);
-       if (fd < 0)
-               return -1;
-
-       rc = fstat(fd, &statbuf);
-       if (rc < 0)
-               goto err_close;
-
-       len = statbuf.st_size;
-       if (len > max_file_size)
-               goto err_close;
-
-       buf = talloc_array(ctx, char, len + 1);
-       if (!buf)
-               goto err_close;
-
-       for (i = 0; i < len; i += rc) {
-               rc = read(fd, buf + i, len - i);
-
-               /* unexpected EOF: trim and return */
-               if (rc == 0) {
-                       len = i;
-                       break;
-               }
-
-               if (rc < 0)
-                       goto err_free;
-
-       }
-
-       buf[len] = '\0';
-
-       close(fd);
-       *bufp = buf;
-       *lenp = len;
-       return 0;
-
-err_free:
-       talloc_free(buf);
-err_close:
-       close(fd);
-       return -1;
-}
-
 static char *local_path(struct discover_context *ctx,
                const char *filename)
 {
@@ -81,23 +29,22 @@ static char *local_path(struct discover_context *ctx,
 
 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;
 }
 
@@ -177,6 +124,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);
 }