X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.h;h=191b8dc84c6a5debcfeb3333362898f1b0d31f5a;hp=34de79a1649fd34e7ed4b8f22aa1ef582a7a5cba;hb=1c3cb3b066bae9a981732d6ab868cee6df2136b4;hpb=c62667e5c78ea212e5ac49244e9792954a1d8f71

diff --git a/discover/paths.h b/discover/paths.h
index 34de79a..191b8dc 100644
--- a/discover/paths.h
+++ b/discover/paths.h
@@ -1,37 +1,7 @@
 #ifndef PATHS_H
 #define PATHS_H
 
-/**
- * Given a string (eg /dev/sda1, sda1 or UUID=B8E53381CA9EA0E3), parse the
- * device path (eg /dev/sda1). Any device descriptions read from config files
- * should be parsed into the path first.
- *
- * The cur_dev is provided for some remapping situations. If NULL is provided,
- * no remapping will be done.
- *
- * Returns a newly-allocated string.
- */
-char *parse_device_path(void *alloc_ctx,
-		const char *dev_str, const char *current_device);
-
-/**
- * Get the mountpoint for a device.
- */
-const char *mountpoint_for_device(const char *dev);
-
-/**
- * Resolve a path given in a config file, to a path in the local filesystem.
- * Paths may be of the form:
- *  device:path (eg /dev/sda:/boot/vmlinux)
- *
- * or just a path:
- *  /boot/vmlinux
- * - in this case, the current mountpoint is used.
- *
- * Returns a newly-allocated string containing a full path to the file in path
- */
-char *resolve_path(void *alloc_ctx,
-		const char *path, const char *current_device);
+#include <url/url.h>
 
 /**
  * Utility function for joining two paths. Adds a / between a and b if
@@ -41,17 +11,43 @@ char *resolve_path(void *alloc_ctx,
  */
 char *join_paths(void *alloc_ctx, const char *a, const char *b);
 
-/**
- * encode a disk label (or uuid) for use in a symlink.
- */
-char *encode_label(void *alloc_ctx, const char *label);
-
 /**
  * Returns the base path for mount points
  */
 const char *mount_base(void);
 
+struct load_task;
+
+struct load_url_result {
+	enum {
+		LOAD_OK,    /* load complete. other members should only be
+			       accessed if status == LOAD_OK */
+
+		LOAD_ERROR, /* only signalled to async loaders
+			     * (sync will see a NULL result) */
+
+		LOAD_ASYNC, /* async load still in progress */
+
+		LOAD_CANCELLED,
+	} status;
+	struct pb_url		*url;
+	const char		*local;
+	bool			cleanup_local;
+	struct load_task	*task;
+};
+
+/* callback type for asynchronous loads. The callback implementation is
+ * responsible for freeing result.
+ */
+typedef void (*load_url_complete)(struct load_url_result *result, void *data);
+
 /* Load a (potentially remote) file, and return a guaranteed-local name */
-char *load_file(void *ctx, const char *remote, unsigned int *tempfile);
+struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
+		load_url_complete complete, void *data);
+
+/* Cancel a pending load */
+void load_url_async_cancel(struct load_url_result *res);
+
+struct load_url_result *load_url(void *ctx, struct pb_url *url);
 
 #endif /* PATHS_H */