From f800782ac2426c12e001467b5222331957185854 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 16 Oct 2016 22:45:59 +0200 Subject: [PATCH] block: add probe abstraction layer Add an abstraction layer which separates block.c from libblkid-tiny implementation details in order to prepare support for optionally using the full libblkid. Signed-off-by: Jo-Philipp Wich --- CMakeLists.txt | 2 +- block.c | 119 +++++++++++++++++++++++++-------------------------------- probe.c | 69 +++++++++++++++++++++++++++++++++ probe.h | 34 +++++++++++++++++ 4 files changed, 157 insertions(+), 67 deletions(-) create mode 100644 probe.c create mode 100644 probe.h diff --git a/CMakeLists.txt b/CMakeLists.txt index b6aa2de..0d4c763 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin) find_library(json NAMES json-c json) -ADD_EXECUTABLE(block block.c) +ADD_EXECUTABLE(block block.c probe.c) IF(DEFINED CMAKE_UBIFS_EXTROOT) ADD_DEFINITIONS(-DUBIFS_EXTROOT) TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ubi-utils ${json}) diff --git a/block.c b/block.c index 843d402..9d22458 100644 --- a/block.c +++ b/block.c @@ -40,7 +40,7 @@ #include #include -#include "libblkid-tiny/libblkid-tiny.h" +#include "probe.h" #ifdef UBIFS_EXTROOT #include "libubi/libubi.h" @@ -461,9 +461,9 @@ static int config_load(char *cfg) return 0; } -static struct blkid_struct_probe* _probe_path(char *path) +static struct probe_info* _probe_path(char *path) { - struct blkid_struct_probe *pr; + struct probe_info *pr; char tmppath[64]; /* skip ubi device if ubiblock device is present */ @@ -475,20 +475,7 @@ static struct blkid_struct_probe* _probe_path(char *path) return NULL; } - pr = malloc(sizeof(*pr)); - - if (!pr) - return NULL; - - memset(pr, 0, sizeof(*pr)); - probe_block(path, pr); - - if (pr->err || !pr->id) { - free(pr); - return NULL; - } - - return pr; + return probe_path(path); } static int _cache_load(const char *path) @@ -501,7 +488,7 @@ static int _cache_load(const char *path) return -1; for (j = 0; j < gl.gl_pathc; j++) { - struct blkid_struct_probe *pr = _probe_path(gl.gl_pathv[j]); + struct probe_info *pr = _probe_path(gl.gl_pathv[j]); if (pr) list_add_tail(&pr->list, &devices); } @@ -528,15 +515,15 @@ static void cache_load(int mtd) } -static int print_block_uci(struct blkid_struct_probe *pr) +static int print_block_uci(struct probe_info *pr) { - if (!strcmp(pr->id->name, "swap")) { + if (!strcmp(pr->type, "swap")) { printf("config 'swap'\n"); } else { printf("config 'mount'\n"); printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev)); } - if (pr->uuid[0]) + if (pr->uuid) printf("\toption\tuuid\t'%s'\n", pr->uuid); else printf("\toption\tdevice\t'%s'\n", pr->dev); @@ -545,23 +532,23 @@ static int print_block_uci(struct blkid_struct_probe *pr) return 0; } -static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char *path) +static struct probe_info* find_block_info(char *uuid, char *label, char *path) { - struct blkid_struct_probe *pr = NULL; + struct probe_info *pr = NULL; if (uuid) list_for_each_entry(pr, &devices, list) - if (!strcasecmp(pr->uuid, uuid)) + if (pr->uuid && !strcasecmp(pr->uuid, uuid)) return pr; if (label) list_for_each_entry(pr, &devices, list) - if (!strcmp(pr->label, label)) + if (pr->label && !strcmp(pr->label, label)) return pr; if (path) list_for_each_entry(pr, &devices, list) - if (!strcmp(basename(pr->dev), basename(path))) + if (pr->dev && !strcmp(basename(pr->dev), basename(path))) return pr; return NULL; @@ -658,22 +645,22 @@ static char* find_mount_point(char *block) return point; } -static int print_block_info(struct blkid_struct_probe *pr) +static int print_block_info(struct probe_info *pr) { static char *mp; mp = find_mount_point(pr->dev); printf("%s:", pr->dev); - if (pr->uuid[0]) + if (pr->uuid) printf(" UUID=\"%s\"", pr->uuid); - if (pr->label[0]) + if (pr->label) printf(" LABEL=\"%s\"", pr->label); - if (pr->name[0]) + if (pr->name) printf(" NAME=\"%s\"", pr->name); - if (pr->version[0]) + if (pr->version) printf(" VERSION=\"%s\"", pr->version); if (mp) { @@ -681,7 +668,7 @@ static int print_block_info(struct blkid_struct_probe *pr) free(mp); } - printf(" TYPE=\"%s\"\n", pr->id->name); + printf(" TYPE=\"%s\"\n", pr->type); return 0; } @@ -698,7 +685,7 @@ static void mkdir_p(char *dir) } } -static void check_filesystem(struct blkid_struct_probe *pr) +static void check_filesystem(struct probe_info *pr) { pid_t pid; struct stat statbuf; @@ -707,15 +694,15 @@ static void check_filesystem(struct blkid_struct_probe *pr) const char *ckfs; /* UBIFS does not need stuff like fsck */ - if (!strncmp(pr->id->name, "ubifs", 5)) + if (!strncmp(pr->type, "ubifs", 5)) return; - if (!strncmp(pr->id->name, "vfat", 4)) { + if (!strncmp(pr->type, "vfat", 4)) { ckfs = dosfsck; - } else if (!strncmp(pr->id->name, "ext", 3)) { + } else if (!strncmp(pr->type, "ext", 3)) { ckfs = e2fsck; } else { - ULOG_ERR("check_filesystem: %s is not supported\n", pr->id->name); + ULOG_ERR("check_filesystem: %s is not supported\n", pr->type); return; } @@ -741,7 +728,7 @@ static void handle_swapfiles(bool on) { struct stat s; struct mount *m; - struct blkid_struct_probe *pr; + struct probe_info *pr; vlist_for_each_element(&mounts, m, node) { @@ -756,7 +743,7 @@ static void handle_swapfiles(bool on) if (!pr) continue; - if (!strcmp(pr->id->name, "swap")) { + if (!strcmp(pr->type, "swap")) { if (on) swapon(pr->dev, m->prio); else @@ -767,7 +754,7 @@ static void handle_swapfiles(bool on) } } -static int mount_device(struct blkid_struct_probe *pr, int hotplug) +static int mount_device(struct probe_info *pr, int hotplug) { struct mount *m; char *device; @@ -778,7 +765,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) device = basename(pr->dev); - if (!strcmp(pr->id->name, "swap")) { + if (!strcmp(pr->type, "swap")) { if (hotplug && !auto_swap) return -1; m = find_swap(pr->uuid, pr->label, device); @@ -816,11 +803,11 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, target, pr->id->name, m->flags, + err = mount(pr->dev, target, pr->type, m->flags, (m->options) ? (m->options) : ("")); if (err) ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n", - pr->dev, pr->id->name, target, err, strerror(err)); + pr->dev, pr->type, target, err, strerror(err)); else handle_swapfiles(true); return err; @@ -836,10 +823,10 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, target, pr->id->name, 0, ""); + err = mount(pr->dev, target, pr->type, 0, ""); if (err) ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n", - pr->dev, pr->id->name, target, err, strerror(err)); + pr->dev, pr->type, target, err, strerror(err)); else handle_swapfiles(true); return err; @@ -848,7 +835,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) return 0; } -static int umount_device(struct blkid_struct_probe *pr) +static int umount_device(struct probe_info *pr) { struct mount *m; char *device = basename(pr->dev); @@ -858,7 +845,7 @@ static int umount_device(struct blkid_struct_probe *pr) if (!pr) return -1; - if (!strcmp(pr->id->name, "swap")) + if (!strcmp(pr->type, "swap")) return -1; mp = find_mount_point(pr->dev); @@ -1058,7 +1045,7 @@ static int test_fs_support(const char *name) static int check_extroot(char *path) { - struct blkid_struct_probe *pr = NULL; + struct probe_info *pr = NULL; char devpath[32]; #ifdef UBIFS_EXTROOT @@ -1139,7 +1126,7 @@ static int mount_extroot(char *cfg) char overlay[] = "/tmp/extroot/overlay"; char mnt[] = "/tmp/extroot/mnt"; char *path = mnt; - struct blkid_struct_probe *pr; + struct probe_info *pr; struct mount *m; int err = -1; @@ -1164,19 +1151,19 @@ static int mount_extroot(char *cfg) if (!pr && delay_root){ ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root); sleep(delay_root); - mkblkdev(); + make_devs(); cache_load(0); pr = find_block_info(m->uuid, m->label, m->device); } if (pr) { - if (strncmp(pr->id->name, "ext", 3) && - strncmp(pr->id->name, "ubifs", 5)) { - ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->id->name); + if (strncmp(pr->type, "ext", 3) && + strncmp(pr->type, "ubifs", 5)) { + ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->type); return -1; } - if (test_fs_support(pr->id->name)) { - ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->id->name); + if (test_fs_support(pr->type)) { + ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->type); return -1; } @@ -1187,12 +1174,12 @@ static int mount_extroot(char *cfg) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, path, pr->id->name, m->flags, + err = mount(pr->dev, path, pr->type, m->flags, (m->options) ? (m->options) : ("")); if (err) { ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n", - pr->dev, pr->id->name, path, err, strerror(err)); + pr->dev, pr->type, path, err, strerror(err)); } else if (m->overlay) { err = check_extroot(path); if (err) @@ -1209,7 +1196,7 @@ static int mount_extroot(char *cfg) static int main_extroot(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; char blkdev_path[32] = { 0 }; int err = -1; #ifdef UBIFS_EXTROOT @@ -1224,7 +1211,7 @@ static int main_extroot(int argc, char **argv) return -1; } - mkblkdev(); + make_devs(); cache_load(1); /* enable LOG_INFO messages */ @@ -1239,7 +1226,7 @@ static int main_extroot(int argc, char **argv) find_block_mtd("\"rootfs_data\"", blkdev_path, sizeof(blkdev_path)); if (blkdev_path[0]) { pr = find_block_info(NULL, NULL, blkdev_path); - if (pr && !strcmp(pr->id->name, "jffs2")) { + if (pr && !strcmp(pr->type, "jffs2")) { char cfg[] = "/tmp/jffs_cfg"; /* @@ -1285,7 +1272,7 @@ static int main_extroot(int argc, char **argv) static int main_mount(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; if (config_load(NULL)) return -1; @@ -1301,7 +1288,7 @@ static int main_mount(int argc, char **argv) static int main_umount(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; if (config_load(NULL)) return -1; @@ -1317,7 +1304,7 @@ static int main_umount(int argc, char **argv) static int main_detect(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; cache_load(0); printf("config 'global'\n"); @@ -1336,7 +1323,7 @@ static int main_detect(int argc, char **argv) static int main_info(int argc, char **argv) { int i; - struct blkid_struct_probe *pr; + struct probe_info *pr; cache_load(1); if (argc == 2) { @@ -1381,7 +1368,7 @@ static int main_swapon(int argc, char **argv) FILE *fp; char *lineptr; size_t s; - struct blkid_struct_probe *pr; + struct probe_info *pr; int flags = 0; int pri; struct stat st; @@ -1406,7 +1393,7 @@ static int main_swapon(int argc, char **argv) case 'a': cache_load(0); list_for_each_entry(pr, &devices, list) { - if (strcmp(pr->id->name, "swap")) + if (strcmp(pr->type, "swap")) continue; if (swapon(pr->dev, 0)) ULOG_ERR("failed to swapon %s\n", pr->dev); diff --git a/probe.c b/probe.c new file mode 100644 index 0000000..9983a72 --- /dev/null +++ b/probe.c @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2016 Jo-Philipp Wich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +#include "probe.h" +#include "libblkid-tiny/libblkid-tiny.h" + +static struct probe_info * +probe_path_tiny(const char *path) +{ + struct probe_info *info = NULL; + struct blkid_struct_probe pr = { }; + char *type, *dev, *uuid, *label, *name, *version; + + if (probe_block((char *)path, &pr) == 0 && pr.id && !pr.err) { + info = calloc_a(sizeof(*info), + &type, strlen(pr.id->name) + 1, + &dev, strlen(pr.dev) + 1, + &uuid, strlen(pr.uuid) + 1, + &label, strlen(pr.label) + 1, + &name, strlen(pr.name) + 1, + &version, strlen(pr.version) + 1); + + if (info) { + info->type = strcpy(type, pr.id->name); + + if (pr.dev[0]) + info->dev = strcpy(dev, pr.dev); + + if (pr.uuid[0]) + info->uuid = strcpy(uuid, pr.uuid); + + if (pr.label[0]) + info->label = strcpy(label, pr.label); + + if (pr.name[0]) + info->name = strcpy(name, pr.name); + + if (pr.version[0]) + info->version = strcpy(version, pr.version); + } + } + + return info; +} + +struct probe_info * +probe_path(const char *path) +{ + return probe_path_tiny(path); +} + +int +make_devs(void) +{ + return mkblkdev(); +} diff --git a/probe.h b/probe.h new file mode 100644 index 0000000..bcee3a8 --- /dev/null +++ b/probe.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2016 Jo-Philipp Wich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _PROBE_H +#define _PROBE_H + +#include + +struct probe_info { + struct list_head list; + + char *type; + char *dev; + char *uuid; + char *label; + char *name; + char *version; +}; + +struct probe_info * probe_path(const char *path); + +int make_devs(void); + +#endif /* _PROBE_H */ -- 2.11.0