lib/process: Add process_get_stdout

[petitboot] / test / parser / utils.c

diff --git a/test/parser/utils.c b/test/parser/utils.c
index f0796fd30f9beea75005df2bd93c00430e56d50e..d8499a47689ab2115065a005aca6d5b957755603 100644 (file)
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -93,6 +93,7 @@ static struct discover_context *test_create_context(struct parser_test *test)
        list_init(&ctx->boot_options);
        ctx->device = test_create_device_simple(test);
        ctx->test_data = test;
+       ctx->handler = test->handler;
        device_handler_add_device(test->handler, ctx->device);
 
        return ctx;
@@ -284,7 +285,7 @@ int parser_replace_file(struct discover_context *ctx,
                char *buf, int len)
 {
        struct parser_test *test = ctx->test_data;
-       struct test_file *f, *file;
+       struct test_file *f, *file = NULL;
 
        list_for_each_entry(&test->files, f, list) {
                if (f->dev != dev)
@@ -308,8 +309,83 @@ int parser_replace_file(struct discover_context *ctx,
        return 0;
 }
 
+int parser_scandir(struct discover_context *ctx, const char *dirname,
+                  struct dirent ***files, int (*filter)(const struct dirent *)
+                  __attribute__((unused)),
+                  int (*comp)(const struct dirent **, const struct dirent **)
+                  __attribute__((unused)))
+{
+       struct parser_test *test = ctx->test_data;
+       struct test_file *f;
+       char *filename;
+       struct dirent **dirents = NULL, **new_dirents;
+       int n = 0, namelen;
+
+       list_for_each_entry(&test->files, f, list) {
+               if (f->dev != ctx->device)
+                       continue;
+
+               if (strlen(f->name) <= strlen(dirname))
+                       continue;
+
+               filename = strrchr(f->name, '/');
+               if (!filename)
+                       continue;
+
+               namelen = strlen(filename);
+
+               if (strncmp(f->name, dirname, strlen(f->name) - namelen))
+                       continue;
+
+               if (!dirents) {
+                       dirents = malloc(sizeof(struct dirent *));
+               } else {
+                       new_dirents = realloc(dirents, sizeof(struct dirent *)
+                                             * (n + 1));
+                       if (!new_dirents)
+                               goto err_cleanup;
+
+                       dirents = new_dirents;
+               }
+
+               dirents[n] = malloc(sizeof(struct dirent) + namelen + 1);
+
+               if (!dirents[n])
+                       goto err_cleanup;
+
+               strcpy(dirents[n]->d_name, filename + 1);
+               n++;
+       }
+
+       *files = dirents;
+
+       return n;
+
+err_cleanup:
+       do {
+               free(dirents[n]);
+       } while (n-- > 0);
+
+       free(dirents);
+
+       return -1;
+}
+
+bool parser_is_unique(struct discover_context *ctx, struct discover_device *dev,
+       const char *filename, struct list *found_list)
+{
+       (void)ctx;
+       (void)dev;
+       (void)filename;
+       (void)found_list;
+
+       /* Just let the parser process everything. */
+       return true;
+}
+
 struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
-               load_url_complete async_cb, void *async_data)
+               load_url_complete async_cb, void *async_data,
+               waiter_cb stdout_cb, void *stdout_data)
 {
        struct conf_context *conf = async_data;
        struct parser_test *test = conf->dc->test_data;
@@ -319,6 +395,10 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
        struct test_file *file;
        int fd;
 
+       /* Ignore the stdout callback for tests */
+       (void)stdout_cb;
+       (void)stdout_data;
+
        fd = mkstemp(tmp);
 
        if (fd < 0)
@@ -352,6 +432,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
                return NULL;
 
        result->local = talloc_strdup(result, tmp);
+       result->url = url;
        if (rc < 0)
                result->status = LOAD_ERROR;
        else