From 3e2834fe72b023155904e118c4f71a8ff73a90ec Mon Sep 17 00:00:00 2001 From: Reuben Dowle Date: Sat, 5 Feb 2011 03:18:08 +0100 Subject: [PATCH] ubimkvol,ubirmvol,ubirsvol: new applets function old new delta ubi_tools_main - 658 +658 packed_usage 28269 28376 +107 bbconfig_config_bz2 4968 5007 +39 applet_names 2407 2434 +27 applet_main 1396 1408 +12 applet_nameofs 698 704 +6 applet_install_loc 175 176 +1 ubi_attach_detach_main 175 - -175 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 6/0 up/down: 850/-175) Total: 675 bytes Signed-off-by: Reuben Dowle Signed-off-by: Denys Vlasenko --- miscutils/ubi_attach_detach.c | 150 ++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 16 deletions(-) diff --git a/miscutils/ubi_attach_detach.c b/miscutils/ubi_attach_detach.c index aa8a5171a..fef9250ee 100644 --- a/miscutils/ubi_attach_detach.c +++ b/miscutils/ubi_attach_detach.c @@ -3,34 +3,69 @@ * Licensed under GPLv2, see file LICENSE in this source tree. */ -//applet:IF_UBIATTACH(APPLET_ODDNAME(ubiattach, ubi_attach_detach, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach)) -//applet:IF_UBIDETACH(APPLET_ODDNAME(ubidetach, ubi_attach_detach, BB_DIR_USR_SBIN, BB_SUID_DROP, ubidetach)) - -//kbuild:lib-$(CONFIG_UBIATTACH) += ubi_attach_detach.o -//kbuild:lib-$(CONFIG_UBIDETACH) += ubi_attach_detach.o - //config:config UBIATTACH //config: bool "ubiattach" -//config: default n +//config: default y //config: depends on PLATFORM_LINUX //config: help //config: Attach MTD device to an UBI device. //config: //config:config UBIDETACH //config: bool "ubidetach" -//config: default n +//config: default y //config: depends on PLATFORM_LINUX //config: help //config: Detach MTD device from an UBI device. +//config: +//config:config UBIMKVOL +//config: bool "ubimkvol" +//config: default y +//config: depends on PLATFORM_LINUX +//config: help +//config: Create a UBI volume. +//config: +//config:config UBIRMVOL +//config: bool "ubirmvol" +//config: default y +//config: depends on PLATFORM_LINUX +//config: help +//config: Delete a UBI volume. +//config: +//config:config UBIRSVOL +//config: bool "ubirsvol" +//config: default y +//config: depends on PLATFORM_LINUX +//config: help +//config: Resize a UBI volume. + +//applet:IF_UBIATTACH(APPLET_ODDNAME(ubiattach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach)) +//applet:IF_UBIDETACH(APPLET_ODDNAME(ubidetach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubidetach)) +//applet:IF_UBIMKVOL(APPLET_ODDNAME(ubimkvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubimkvol)) +//applet:IF_UBIRMVOL(APPLET_ODDNAME(ubirmvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirmvol)) +//applet:IF_UBIRSVOL(APPLET_ODDNAME(ubirsvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirsvol)) + +//kbuild:lib-$(CONFIG_UBIATTACH) += ubi_attach_detach.o +//kbuild:lib-$(CONFIG_UBIDETACH) += ubi_attach_detach.o +//kbuild:lib-$(CONFIG_UBIMKVOL) += ubi_attach_detach.o +//kbuild:lib-$(CONFIG_UBIRMVOL) += ubi_attach_detach.o +//kbuild:lib-$(CONFIG_UBIRSVOL) += ubi_attach_detach.o #include "libbb.h" #include #define OPTION_M (1 << 0) #define OPTION_D (1 << 1) +#define OPTION_n (1 << 2) +#define OPTION_N (1 << 3) +#define OPTION_s (1 << 4) +#define OPTION_a (1 << 5) +#define OPTION_t (1 << 6) -#define do_attach (ENABLE_UBIATTACH && \ - (!ENABLE_UBIDETACH || (applet_name[3] == 'a'))) +#define do_attach (ENABLE_UBIATTACH && applet_name[3] == 'a') +#define do_detach (ENABLE_UBIDETACH && applet_name[3] == 'd') +#define do_mkvol (ENABLE_UBIMKVOL && applet_name[3] == 'm') +#define do_rmvol (ENABLE_UBIRMVOL && applet_name[4] == 'm') +#define do_rsvol (ENABLE_UBIRSVOL && applet_name[4] == 's') //usage:#define ubiattach_trivial_usage //usage: "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV" @@ -46,20 +81,54 @@ //usage: "Detach MTD device from UBI\n" //usage: "\nOptions:" //usage: "\n -d UBI_NUM UBI device number" +//usage: +//usage:#define ubimkvol_trivial_usage +//usage: "UBI_DEVICE -N NAME -s SIZE" +//usage:#define ubimkvol_full_usage "\n\n" +//usage: "Create UBI Volume\n" +//usage: "\nOptions:" +//usage: "\n -a ALIGNMENT Volume alignment (default 1)" +//usage: "\n -n VOLID Volume ID, if not specified, it" +//usage: "\n will be assigned automatically" +//usage: "\n -N NAME Volume name" +//usage: "\n -s SIZE Size in bytes" +//usage: "\n -t TYPE Volume type (static|dynamic)" +//usage: +//usage:#define ubirmvol_trivial_usage +//usage: "UBI_DEVICE -n VOLID" +//usage:#define ubirmvol_full_usage "\n\n" +//usage: "Remove UBI Volume\n" +//usage: "\nOptions:" +//usage: "\n -n VOLID Volume ID" +//usage: +//usage:#define ubirsvol_trivial_usage +//usage: "UBI_DEVICE -N NAME -s SIZE" +//usage:#define ubirsvol_full_usage "\n\n" +//usage: "Resize UBI Volume\n" +//usage: "\nOptions:" +//usage: "\n -N NAME Volume name" +//usage: "\n -s SIZE Size in bytes" -int ubi_attach_detach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ubi_attach_detach_main(int argc UNUSED_PARAM, char **argv) +int ubi_tools_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ubi_tools_main(int argc UNUSED_PARAM, char **argv) { unsigned opts; char *ubi_ctrl; //struct stat st; - struct ubi_attach_req req; int fd; int mtd_num; int dev_num = UBI_DEV_NUM_AUTO; + int vol_id = UBI_VOL_NUM_AUTO; + char *vol_name = NULL; + int size_bytes; + int alignment = 1; + char *type = NULL; - opt_complementary = "=1:m+:d+"; - opts = getopt32(argv, "m:d:", &mtd_num, &dev_num); + opt_complementary = "=1:m+:d+:n+:s+:a+"; + opts = getopt32(argv, "m:d:n:N:s:a:t:", + &mtd_num, &dev_num, &vol_id, + &vol_name, &size_bytes, &alignment, &type + ); ubi_ctrl = argv[optind]; fd = xopen(ubi_ctrl, O_RDWR); @@ -68,6 +137,7 @@ int ubi_attach_detach_main(int argc UNUSED_PARAM, char **argv) // bb_error_msg_and_die("%s: not a char device", ubi_ctrl); if (do_attach) { + struct ubi_attach_req req; if (!(opts & OPTION_M)) bb_error_msg_and_die("%s device not specified", "MTD"); @@ -76,11 +146,59 @@ int ubi_attach_detach_main(int argc UNUSED_PARAM, char **argv) req.ubi_num = dev_num; xioctl(fd, UBI_IOCATT, &req); - } else { /* detach */ + } else + if (do_detach) { if (!(opts & OPTION_D)) bb_error_msg_and_die("%s device not specified", "UBI"); xioctl(fd, UBI_IOCDET, &dev_num); + } else + if (do_mkvol) { + struct ubi_mkvol_req req; + int vol_name_len; + if (!(opts & OPTION_s)) + bb_error_msg_and_die("%s size not specified", "UBI"); + if (!(opts & OPTION_N)) + bb_error_msg_and_die("%s name not specified", "UBI"); + vol_name_len = strlen(vol_name); + if (vol_name_len > UBI_MAX_VOLUME_NAME) + bb_error_msg_and_die("%s volume name too long", "UBI"); + + memset(&req, 0, sizeof(req)); + req.vol_id = vol_id; + if (opts & OPTION_t) { + if (type[0] == 's') + req.vol_type = UBI_STATIC_VOLUME; + else + req.vol_type = UBI_DYNAMIC_VOLUME; + } else { + req.vol_type = UBI_DYNAMIC_VOLUME; + } + req.alignment = alignment; + req.bytes = size_bytes; + strncpy(req.name, vol_name, UBI_MAX_VOLUME_NAME); + req.name_len = vol_name_len; + + xioctl(fd, UBI_IOCMKVOL, &req); + } else + if (do_rmvol) { + if (!(opts & OPTION_n)) + bb_error_msg_and_die("%s volume id not specified", "UBI"); + + xioctl(fd, UBI_IOCRMVOL, &vol_id); + } else + if (do_rsvol) { + struct ubi_rsvol_req req; + if (!(opts & OPTION_s)) + bb_error_msg_and_die("%s size not specified", "UBI"); + if (!(opts & OPTION_n)) + bb_error_msg_and_die("%s volume id not specified", "UBI"); + + memset(&req, 0, sizeof(req)); + req.bytes = size_bytes; + req.vol_id = vol_id; + + xioctl(fd, UBI_IOCRSVOL, &req); } if (ENABLE_FEATURE_CLEAN_UP)