From: Jeremy Kerr <jk@ozlabs.org>
Date: Thu, 26 Sep 2013 07:15:29 +0000 (+0800)
Subject: discover/paths: Check local file URLs in load_url
X-Git-Tag: v1.0.0~415
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=384d406380d8bf164ed2ca3879488cc4974239be;hp=2e97d0eea0d8a480877a1aabb4c67ad1aad59ed1

discover/paths: Check local file URLs in load_url

Make the error case for local files the same as for remotes.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/paths.c b/discover/paths.c
index b163e45..c352ca0 100644
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -313,6 +313,25 @@ static void load_wget(struct load_task *task, int flags)
 	load_process_to_local_file(task, argv, 2);
 }
 
+/* Although we don't need to load anything for a local path (we just return
+ * the path from the file:// URL), the other load helpers will error-out on
+ * non-existant files. So, do the same here with an access() check on the local
+ * filename.
+ */
+static void load_local(struct load_task *task)
+{
+	int rc;
+
+	rc = access(task->url->path, F_OK);
+	if (rc) {
+		task->result->status = LOAD_ERROR;
+	} else {
+		task->result->local = talloc_strdup(task->result,
+						    task->url->path);
+		task->result->status = LOAD_OK;
+	}
+}
+
 /**
  * load_url - Loads a (possibly) remote URL and returns the local file
  * path.
@@ -366,9 +385,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
 		load_tftp(task);
 		break;
 	default:
-		task->result->local = talloc_strdup(task->result,
-							url->path);
-		task->result->status = LOAD_OK;
+		load_local(task);
 		break;
 	}