From dc13479d33efc6cf4b55bfd7b4875c44e4a9bbd0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Sun, 12 Apr 2009 15:11:47 +0000 Subject: [PATCH] Add URL test to resolve_path Add a check to discover's resolve_path() to test if the path is a URL, and if so just return that path. If the path has "file://", treat it as a local path. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- discover/paths.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/discover/paths.c b/discover/paths.c index 5b550fa..8e2a361 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -116,9 +116,17 @@ const char *mountpoint_for_device(const char *dev) char *resolve_path(void *alloc_ctx, const char *path, const char *current_dev) { + static const char s_file[] = "file://"; char *ret; const char *devpath, *sep; + /* test for urls */ + + if (!strncasecmp(path, s_file, sizeof(s_file) - 1)) + path += sizeof(s_file) - 1; + else if (strstr(path, "://")) + return talloc_strdup(alloc_ctx, path); + sep = strchr(path, ':'); if (!sep) { devpath = mountpoint_for_device(current_dev); -- 2.39.2