X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.c;h=ce90caee3775d8b9714fb865d4ef6dad1c98ce5d;hp=ef8a45f924c8fa658fd4c39330f40eaf485761b4;hb=98a3faddc9e01e2bfc9c267f32fce0173678a40a;hpb=c62667e5c78ea212e5ac49244e9792954a1d8f71 diff --git a/discover/paths.c b/discover/paths.c index ef8a45f..ce90cae 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -13,135 +14,11 @@ #define DEVICE_MOUNT_BASE (LOCAL_STATE_DIR "/petitboot/mnt") -struct mount_map { - char *dev, *mnt; -}; - -static struct mount_map *mount_map; -static int mount_map_size; - -static int is_prefix(const char *str, const char *prefix) -{ - return !strncmp(str, prefix, strlen(prefix)); -} - -static int is_prefix_ignorecase(const char *str, const char *prefix) -{ - return !strncasecmp(str, prefix, strlen(prefix)); -} - const char *mount_base(void) { return DEVICE_MOUNT_BASE; } -char *encode_label(void *alloc_ctx, const char *label) -{ - char *str, *c; - unsigned int i; - - /* the label can be expanded by up to four times */ - str = talloc_size(alloc_ctx, strlen(label) * 4 + 1); - c = str; - - for (i = 0; i < strlen(label); i++) { - - if (label[i] == '/' || label[i] == '\\') { - sprintf(c, "\\x%02x", label[i]); - c += 4; - continue; - } - - *(c++) = label[i]; - } - - *c = '\0'; - - return str; -} - -char *parse_device_path(void *alloc_ctx, - const char *dev_str, const char __attribute__((unused)) *cur_dev) -{ - char *dev, *enc; - - if (is_prefix_ignorecase(dev_str, "uuid=")) { - dev = talloc_asprintf(alloc_ctx, "/dev/disk/by-uuid/%s", - dev_str + strlen("uuid=")); - return dev; - } - - if (is_prefix_ignorecase(dev_str, "label=")) { - enc = encode_label(NULL, dev_str + strlen("label=")); - dev = talloc_asprintf(alloc_ctx, "/dev/disk/by-label/%s", enc); - talloc_free(enc); - return dev; - } - - /* normalise '/dev/foo' to 'foo' for easy comparisons, we'll expand - * back before returning. - */ - if (is_prefix(dev_str, "/dev/")) - dev_str += strlen("/dev/"); - - return join_paths(alloc_ctx, "/dev", dev_str); -} - -const char *mountpoint_for_device(const char *dev) -{ - int i; - - if (is_prefix(dev, "/dev/")) - dev += strlen("/dev/"); - - /* check existing entries in the map */ - for (i = 0; i < mount_map_size; i++) - if (!strcmp(mount_map[i].dev, dev)) - return mount_map[i].mnt; - - /* no existing entry, create a new one */ - i = mount_map_size++; - mount_map = talloc_realloc(NULL, mount_map, - struct mount_map, mount_map_size); - - mount_map[i].dev = talloc_strdup(mount_map, dev); - mount_map[i].mnt = join_paths(mount_map, DEVICE_MOUNT_BASE, dev); - return mount_map[i].mnt; -} - -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); - ret = join_paths(alloc_ctx, devpath, path); - } else { - /* parse just the device name into dev */ - char *tmp, *dev; - tmp = talloc_strndup(NULL, path, sep - path); - dev = parse_device_path(NULL, tmp, current_dev); - - devpath = mountpoint_for_device(dev); - ret = join_paths(alloc_ctx, devpath, sep + 1); - - talloc_free(dev); - talloc_free(tmp); - } - - return ret; -} - char *join_paths(void *alloc_ctx, const char *a, const char *b) { char *full_path; @@ -180,11 +57,8 @@ static char *local_name(void *ctx) */ static char *load_nfs(void *ctx, struct pb_url *url) { + char *local, *opts; int result; - const char *argv[8]; - const char **p; - char *local; - char *opts; local = local_name(ctx); @@ -201,17 +75,8 @@ static char *load_nfs(void *ctx, struct pb_url *url) if (url->port) opts = talloc_asprintf_append(opts, ",port=%s", url->port); - p = argv; - *p++ = pb_system_apps.mount; /* 1 */ - *p++ = "-t"; /* 2 */ - *p++ = "nfs"; /* 3 */ - *p++ = opts; /* 4 */ - *p++ = url->host; /* 5 */ - *p++ = url->dir; /* 6 */ - *p++ = local; /* 7 */ - *p++ = NULL; /* 8 */ - - result = pb_run_cmd(argv, 1, 0); + result = process_run_simple(ctx, pb_system_apps.mount, "-t", "nfs", + opts, url->host, url->dir, local, NULL); talloc_free(opts); @@ -237,23 +102,18 @@ fail: */ static char *load_sftp(void *ctx, struct pb_url *url) { + char *host_path, *local; int result; - const char *argv[4]; - const char **p; - char *local; local = local_name(ctx); if (!local) return NULL; - p = argv; - *p++ = pb_system_apps.sftp; /* 1 */ - *p++ = talloc_asprintf(local, "%s:%s", url->host, url->path); /* 2 */ - *p++ = local; /* 3 */ - *p++ = NULL; /* 4 */ + host_path = talloc_asprintf(local, "%s:%s", url->host, url->path); - result = pb_run_cmd(argv, 1, 0); + result = process_run_simple(ctx, pb_system_apps.sftp, host_path, + local, NULL); if (result) goto fail; @@ -298,7 +158,7 @@ static char *load_tftp(void *ctx, struct pb_url *url) *p++ = url->port; /* 8 */ *p++ = NULL; /* 9 */ - result = pb_run_cmd(argv, 1, 0); + result = process_run_simple_argv(ctx, argv); if (!result) return local; @@ -318,7 +178,7 @@ static char *load_tftp(void *ctx, struct pb_url *url) *p++ = local; /* 9 */ *p++ = NULL; /* 10 */ - result = pb_run_cmd(argv, 1, 0); + result = process_run_simple_argv(ctx, argv); if (!result) return local; @@ -363,7 +223,7 @@ static char *load_wget(void *ctx, struct pb_url *url, enum wget_flags flags) *p++ = "--no-check-certificate"; /* 6 */ *p++ = NULL; /* 7 */ - result = pb_run_cmd(argv, 1, 0); + result = process_run_simple_argv(ctx, argv); if (result) goto fail; @@ -376,10 +236,10 @@ fail: } /** - * pb_load_file - Loads a (possibly) remote file and returns the local file + * load_url - Loads a (possibly) remote URL and returns the local file * path. * @ctx: The talloc context to associate with the returned string. - * @remote: The remote file URL. + * @URL: The remote file URL. * @tempfile: An optional variable pointer to be set when a temporary local * file is created. * @@ -387,9 +247,8 @@ fail: * or NULL on error. */ -char *load_file(void *ctx, const char *remote, unsigned int *tempfile) +char *load_url(void *ctx, struct pb_url *url, unsigned int *tempfile) { - struct pb_url *url = pb_url_parse(ctx, remote); char *local; int tmp = 0; @@ -427,6 +286,5 @@ char *load_file(void *ctx, const char *remote, unsigned int *tempfile) if (tempfile) *tempfile = tmp; - talloc_free(url); return local; }