diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-12-19 11:41:23 +1100 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-12-20 16:40:21 +1100 |
| commit | ca11198f4034266b0f48b37e5871c44d1399aba6 (patch) | |
| tree | 7fe71c9c1c82de7a98134613ca1c141eee919466 /discover/paths.c | |
| parent | 0ba871a497f156dd474a333889cd92eaab9b08dc (diff) | |
| download | talos-petitboot-ca11198f4034266b0f48b37e5871c44d1399aba6.tar.gz talos-petitboot-ca11198f4034266b0f48b37e5871c44d1399aba6.zip | |
discover/paths: Add stdout callback parameter for load_url_async()
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/paths.c')
| -rw-r--r-- | discover/paths.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/discover/paths.c b/discover/paths.c index 8d85619..ad42b5b 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -370,7 +370,8 @@ static void load_local(struct load_task *task) */ 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 load_url_result *result; struct load_task *task; @@ -390,6 +391,14 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url, task->async_data = async_data; task->process->exit_cb = load_url_process_exit; task->process->data = task; + task->process->stdout_cb = stdout_cb; + task->process->stdout_data = stdout_data; + } + + /* Make sure we save output for any task that has a custom handler */ + if (task->process->stdout_cb) { + task->process->add_stderr = true; + task->process->keep_stdout = true; } switch (url->scheme) { @@ -430,7 +439,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url, struct load_url_result *load_url(void *ctx, struct pb_url *url) { - return load_url_async(ctx, url, NULL, NULL); + return load_url_async(ctx, url, NULL, NULL, NULL, NULL); } void load_url_async_cancel(struct load_url_result *res) |
