#include "log/log.h"
#include <system/system.h>
+#include <url/url.h>
#include "talloc/talloc.h"
#include "loader.h"
-#include "url.h"
/**
*p++ = local; /* 7 */
*p++ = NULL; /* 8 */
- result = pb_run_cmd(argv);
+ result = pb_run_cmd(argv, 1, 0);
talloc_free(opts);
static char *pb_load_sftp(void *ctx, struct pb_url __attribute__((unused)) *url)
{
int result;
- const char *argv[5];
+ const char *argv[4];
const char **p;
char *local;
return NULL;
p = argv;
- *p++ = pb_system_apps.sftp; /* 1 */
- *p++ = url->host; /* 2 */
- *p++ = url->path; /* 3 */
- *p++ = local; /* 4 */
- *p++ = NULL; /* 5 */
+ *p++ = pb_system_apps.sftp; /* 1 */
+ *p++ = talloc_asprintf(local, "%s:%s", url->host, url->path); /* 2 */
+ *p++ = local; /* 3 */
+ *p++ = NULL; /* 4 */
- result = pb_run_cmd(argv);
+ result = pb_run_cmd(argv, 1, 0);
if (result)
goto fail;
*p++ = url->port; /* 8 */
*p++ = NULL; /* 9 */
- result = pb_run_cmd(argv);
+ result = pb_run_cmd(argv, 1, 0);
if (!result)
return local;
*p++ = local; /* 9 */
*p++ = NULL; /* 10 */
- result = pb_run_cmd(argv);
+ result = pb_run_cmd(argv, 1, 0);
if (!result)
return local;
*p++ = "--no-check-certificate"; /* 6 */
*p++ = NULL; /* 7 */
- result = pb_run_cmd(argv);
+ result = pb_run_cmd(argv, 1, 0);
if (result)
goto fail;