From: Geoff Levand <geoff@infradead.org>
Date: Tue, 3 Apr 2012 00:20:37 +0000 (-0700)
Subject: Fix sftp loader
X-Git-Tag: v1.0.0~756
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=49a33ebc7ffc389069849b739d0d75b5749c9356

Fix sftp loader

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/ui/common/loader.c b/ui/common/loader.c
index 775f211..74b3c76 100644
--- a/ui/common/loader.c
+++ b/ui/common/loader.c
@@ -122,7 +122,7 @@ fail:
 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;
 
@@ -132,11 +132,10 @@ static char *pb_load_sftp(void *ctx, struct pb_url __attribute__((unused)) *url)
 		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, 1, 0);