From 86dd9696d3a1acb036d65909d93d73455b8aed3a Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Tue, 19 Feb 2008 14:54:17 +0200 Subject: Revert ubi-tools changes Restore ubi tools to their "original" state, which means to the state they were before I stareted cleaning them up. Instead, create a "new-utils" subdirectory and move my work there. Signed-off-by: Artem Bityutskiy --- ubi-utils/src/ubimkvol.c | 424 +++++++++++++++++++++++++++-------------------- 1 file changed, 245 insertions(+), 179 deletions(-) (limited to 'ubi-utils/src/ubimkvol.c') diff --git a/ubi-utils/src/ubimkvol.c b/ubi-utils/src/ubimkvol.c index 75c180d..bff6068 100644 --- a/ubi-utils/src/ubimkvol.c +++ b/ubi-utils/src/ubimkvol.c @@ -19,8 +19,16 @@ /* * An utility to create UBI volumes. * - * Authors: Artem Bityutskiy - * Frank Haverkamp + * Author: Artem B. Bityutskiy + * Frank Haverkamp + * + * 1.0 Initial release + * 1.1 Does not support erase blocks anymore. This is replaced by + * the number of bytes. + * 1.2 Reworked the user-interface to use argp. + * 1.3 Removed argp because we want to use uClibc. + * 1.4 Minor cleanups + * 1.5 Use a different libubi */ #include @@ -28,257 +36,315 @@ #include #include #include +#include +#include #include -#include "common.h" -#define PROGRAM_VERSION "1.6" -#define PROGRAM_NAME "ubimkvol" +#define PROGRAM_VERSION "1.5" -/* The variables below are set by command line arguments */ +/* + * The variables below are set by command line arguments. + */ struct args { + int devn; int vol_id; int vol_type; long long bytes; - int lebs; int alignment; - const char *name; + char *name; int nlen; - const char *node; + char node[256]; int maxavs; + + /* special stuff needed to get additional arguments */ + char *arg1; + char **options; /* [STRING...] */ }; -static struct args args = { +static struct args myargs = { .vol_type = UBI_DYNAMIC_VOLUME, - .bytes = -1, - .lebs = -1, + .devn = -1, + .bytes = 0, .alignment = 1, .vol_id = UBI_VOL_NUM_AUTO, .name = NULL, .nlen = 0, - .node = NULL, .maxavs = 0, }; -static const char *doc = PROGRAM_NAME " version " PROGRAM_VERSION - " - a tool to create UBI volumes."; +static int param_sanity_check(struct args *args, libubi_t libubi); + +static char doc[] = "\nVersion: " PROGRAM_VERSION "\n" + "ubinkvol - make UBI Volume.\n"; static const char *optionsstr = -"-a, --alignment= volume alignment (default is 1)\n" -"-n, --vol_id= UBI volume ID, if not specified, the volume ID\n" -" will be assigned automatically\n" -"-N, --name= volume name\n" -"-s, --size= volume size volume size in bytes, kilobytes (KiB)\n" -" or megabytes (MiB)\n" -"-S, --lebs= alternative way to give volume size in logical\n" -" eraseblocks\n" -"-m, --maxavsize set volume size to maximum available size\n" -"-t, --type= volume type (dynamic, static), default is dynamic\n" -"-h, --help print help message\n" -"-V, --version print program version"; +" -a, --alignment= volume alignment (default is 1)\n" +" -d, --devn= UBI device\n" +" -n, --vol_id= UBI volume id, if not specified, the volume ID\n" +" will be assigned automatically\n" +" -N, --name= volume name\n" +" -s, --size= volume size volume size in bytes, kilobytes (KiB)\n" +" or megabytes (MiB)\n" +" -m, --maxavsize set volume size to maximum available size\n" +" -t, --type= volume type (dynamic, static), default is\n" +" dynamic\n" +" -?, --help Give this help list\n" +" --usage Give a short usage message\n" +" -V, --version Print program version\n"; static const char *usage = -"Usage: " PROGRAM_NAME " [-h] [-a ] [-n ] [-N ]\n" -"\t\t\t[-s ] [-S ] [-t ] [-V] [-m]\n" -"\t\t\t[--alignment=][--vol_id=] [--name=]\n" -"\t\t\t[--size=] [--lebs=] [--type=] [--help]\n" -"\t\t\t[--version] [--maxavsize]\n\n" -"Example: " PROGRAM_NAME "/dev/ubi0 -s 20MiB -N config_data - create a 20 Megabytes volume\n" -" named \"config_data\" on UBI device /dev/ubi0."; - -static const struct option long_options[] = { +"Usage: ubimkvol [-?V] [-a ] [-d ] [-n ]\n" +" [-N ] [-s ] [-t ] [-m]\n" +" [--alignment=] [--devn=] [--vol_id=]\n" +" [--name=] [--size=] [--type=] [--help]\n" +" [--usage] [--version] [--maxavsize]\n"; + +struct option long_options[] = { { .name = "alignment", .has_arg = 1, .flag = NULL, .val = 'a' }, - { .name = "vol_id", .has_arg = 1, .flag = NULL, .val = 'n' }, - { .name = "name", .has_arg = 1, .flag = NULL, .val = 'N' }, - { .name = "size", .has_arg = 1, .flag = NULL, .val = 's' }, - { .name = "lebs", .has_arg = 1, .flag = NULL, .val = 'S' }, - { .name = "type", .has_arg = 1, .flag = NULL, .val = 't' }, - { .name = "help", .has_arg = 0, .flag = NULL, .val = 'h' }, - { .name = "version", .has_arg = 0, .flag = NULL, .val = 'V' }, + { .name = "devn", .has_arg = 1, .flag = NULL, .val = 'd' }, + { .name = "vol_id", .has_arg = 1, .flag = NULL, .val = 'n' }, + { .name = "name", .has_arg = 1, .flag = NULL, .val = 'N' }, + { .name = "size", .has_arg = 1, .flag = NULL, .val = 's' }, + { .name = "type", .has_arg = 1, .flag = NULL, .val = 't' }, + { .name = "help", .has_arg = 0, .flag = NULL, .val = '?' }, + { .name = "usage", .has_arg = 0, .flag = NULL, .val = 0 }, + { .name = "version", .has_arg = 0, .flag = NULL, .val = 'V' }, { .name = "maxavsize", .has_arg = 0, .flag = NULL, .val = 'm' }, - { NULL, 0, NULL, 0}, + { NULL, 0, NULL, 0} }; -static int param_sanity_check(void) +/* + * @brief Parse the arguments passed into the test case. + * + * @param argc The number of arguments + * @param argv The list of arguments + * @param args Pointer to argument structure + * + * @return error + * + */ +static int +parse_opt(int argc, char **argv, struct args *args) { - int len; - - if (args.bytes == -1 && !args.maxavs && args.lebs == -1) - return errmsg("volume size was not specified (use -h for help)"); - - if ((args.bytes != -1 && (args.maxavs || args.lebs != -1)) || - (args.lebs != -1 && (args.maxavs || args.bytes != -1)) || - (args.maxavs && (args.bytes != -1 || args.lebs != -1))) - return errmsg("size specified with more then one option"); - - if (args.name == NULL) - return errmsg("volume name was not specified (use -h for help)"); - - len = strlen(args.name); - if (len > UBI_MAX_VOLUME_NAME) - return errmsg("too long name (%d symbols), max is %d", len, UBI_MAX_VOLUME_NAME); - - return 0; -} + char *endp; -static int parse_opt(int argc, char * const argv[]) -{ while (1) { int key; - char *endp; - key = getopt_long(argc, argv, "a:n:N:s:S:t:hVm", long_options, NULL); + key = getopt_long(argc, argv, "a:d:n:N:s:t:?Vm", long_options, NULL); if (key == -1) break; switch (key) { - case 't': - if (!strcmp(optarg, "dynamic")) - args.vol_type = UBI_DYNAMIC_VOLUME; - else if (!strcmp(optarg, "static")) - args.vol_type = UBI_STATIC_VOLUME; - else - return errmsg("bad volume type: \"%s\"", optarg); - break; - - case 's': - args.bytes = ubiutils_get_bytes(optarg); - if (args.bytes <= 0) - return errmsg("bad volume size: \"%s\"", optarg); - break; - - case 'S': - args.lebs = strtoull(optarg, &endp, 0); - if (endp == optarg || args.lebs <= 0 || *endp != '\0') - return errmsg("bad LEB count: \"%s\"", optarg); - break; - - case 'a': - args.alignment = strtoul(optarg, &endp, 0); - if (*endp != '\0' || endp == optarg || args.alignment <= 0) - return errmsg("bad volume alignment: \"%s\"", optarg); - break; - - case 'n': - args.vol_id = strtoul(optarg, &endp, 0); - if (*endp != '\0' || endp == optarg || args.vol_id < 0) - return errmsg("bad volume ID: " "\"%s\"", optarg); - break; - - case 'N': - args.name = optarg; - args.nlen = strlen(args.name); - break; - - case 'h': - fprintf(stderr, "%s\n\n", doc); - fprintf(stderr, "%s\n\n", usage); - fprintf(stderr, "%s\n", optionsstr); - exit(EXIT_SUCCESS); + case 't': + if (!strcmp(optarg, "dynamic")) + args->vol_type = UBI_DYNAMIC_VOLUME; + else if (!strcmp(optarg, "static")) + args->vol_type = UBI_STATIC_VOLUME; + else { + fprintf(stderr, + "Bad volume type: \"%s\"\n", + optarg); + goto out; + } + break; + case 's': + args->bytes = strtoull(optarg, &endp, 0); + if (endp == optarg || args->bytes < 0) { + fprintf(stderr, + "Bad volume size: \"%s\"\n", + optarg); + goto out; + } + if (endp != '\0') { + if (strcmp(endp, "KiB") == 0) + args->bytes *= 1024; + else if (strcmp(endp, "MiB") == 0) + args->bytes *= 1024*1024; + } + break; + case 'a': + args->alignment = strtoul(optarg, &endp, 0); + if (*endp != '\0' || endp == optarg || + args->alignment <= 0) { + fprintf(stderr, "Bad volume alignment: " + "\"%s\"\n", optarg); + goto out; + } + break; + case 'd': /* --devn= */ + args->devn = strtoul(optarg, &endp, 0); + if (*endp != '\0' || endp == optarg || + args->devn < 0) { + fprintf(stderr, + "Bad UBI device number: " + "\"%s\"\n", optarg); + goto out; + } + sprintf(args->node, "/dev/ubi%d", args->devn); + break; + case 'n': /* --volid= */ + args->vol_id = strtoul(optarg, &endp, 0); + if (*endp != '\0' || + endp == optarg || + (args->vol_id < 0 && + args->vol_id != UBI_DYNAMIC_VOLUME)) { + fprintf(stderr, "Bad volume ID: " + "\"%s\"\n", optarg); + goto out; + } + break; + case 'N': + args->name = optarg; + args->nlen = strlen(args->name); + break; + + case ':': + fprintf(stderr, "Parameter is missing\n"); + goto out; + + case '?': /* help */ + fprintf(stderr, + "Usage: ubimkvol [OPTION...]\n"); + fprintf(stderr, "%s", doc); + fprintf(stderr, "%s", optionsstr); + fprintf(stderr, "\nReport bugs to %s\n", + PACKAGE_BUGREPORT); + exit(0); + break; + + case 'V': + fprintf(stderr, "%s\n", PROGRAM_VERSION); + exit(0); + break; + + case 'm': + args->maxavs = 1; + break; + + default: + fprintf(stderr, "%s", usage); + exit(-1); + } + } - case 'V': - fprintf(stderr, "%s\n", PROGRAM_VERSION); - exit(EXIT_SUCCESS); + return 0; + out: + return -1; +} - case 'm': - args.maxavs = 1; - break; +static int param_sanity_check(struct args *args, libubi_t libubi) +{ + int err, len; + struct ubi_info ubi; - case ':': - return errmsg("parameter is missing"); + if (args->bytes == 0 && !args->maxavs) { + fprintf(stderr, "Volume size was not specified\n"); + goto out; + } - default: - fprintf(stderr, "Use -h for help\n"); - return -1; - } + if (args->name == NULL) { + fprintf(stderr, "Volume name was not specified\n"); + goto out; } - if (optind == argc) - return errmsg("UBI device name was not specified (use -h for help)"); - else if (optind != argc - 1) - return errmsg("more then one UBI device specified (use -h for help)"); + err = ubi_get_info(libubi, &ubi); + if (err) + return -1; - args.node = argv[optind]; + if (args->devn >= (int)ubi.dev_count) { + fprintf(stderr, "Device %d does not exist\n", args->devn); + goto out; + } - if (param_sanity_check()) - return -1; + len = strlen(args->name); + if (len > UBI_MAX_VOLUME_NAME) { + fprintf(stderr, "Too long name (%d symbols), max is %d\n", + len, UBI_MAX_VOLUME_NAME); + goto out; + } return 0; +out: + errno = EINVAL; + return -1; } int main(int argc, char * const argv[]) { int err; libubi_t libubi; - struct ubi_dev_info dev_info; - struct ubi_vol_info vol_info; struct ubi_mkvol_request req; - err = parse_opt(argc, argv); - if (err) - return err; + err = parse_opt(argc, (char **)argv, &myargs); + if (err) { + fprintf(stderr, "Wrong options ...\n"); + return err == 1 ? 0 : -1; + } - libubi = libubi_open(); - if (!libubi) - return sys_errmsg("cannot open libubi"); + if (myargs.devn == -1) { + fprintf(stderr, "Device number was not specified\n"); + fprintf(stderr, "Use -h option for help\n"); + return -1; + } - err = ubi_node_type(libubi, args.node); - if (err == 2) { - errmsg("\"%s\" is an UBI volume node, not an UBI device node", - args.node); - goto out_libubi; - } else if (err < 0) { - errmsg("\"%s\" is not an UBI device node", args.node); - goto out_libubi; + libubi = libubi_open(); + if (libubi == NULL) { + perror("Cannot open libubi"); + return -1; } - err = ubi_get_dev_info(libubi, args.node, &dev_info); + err = param_sanity_check(&myargs, libubi); if (err) { - sys_errmsg("cannot get information about UBI device \"%s\"", - args.node); + perror("Input parameters check"); + fprintf(stderr, "Use -h option for help\n"); goto out_libubi; } - if (args.maxavs) { - args.bytes = dev_info.avail_bytes; - printf("Set volume size to %lld\n", req.bytes); - } + req.vol_id = myargs.vol_id; + req.alignment = myargs.alignment; - if (args.lebs != -1) { - args.bytes = dev_info.leb_size; - args.bytes -= dev_info.leb_size % args.alignment; - args.bytes *= args.lebs; - } + if (myargs.maxavs) { + struct ubi_dev_info ubi_dev; + + err = ubi_get_dev_info1(libubi, myargs.devn, &ubi_dev); + if (err) { + perror("Can't get UBI device info"); + goto out_libubi; + } + req.bytes = ubi_dev.avail_bytes; + if (!req.bytes) { + fprintf(stderr, "There is no available free space on device!\n"); + goto out_libubi; + } + printf("Setting the volume size to %lld\n", req.bytes); + } else + req.bytes = myargs.bytes; - req.vol_id = args.vol_id; - req.alignment = args.alignment; - req.bytes = args.bytes; - req.vol_type = args.vol_type; - req.name = args.name; + req.vol_type = myargs.vol_type; + req.name = myargs.name; - err = ubi_mkvol(libubi, args.node, &req); + err = ubi_mkvol(libubi, myargs.node, &req); if (err < 0) { - sys_errmsg("cannot UBI create volume"); + perror("Cannot create volume"); + fprintf(stderr, " err=%d\n", err); goto out_libubi; } - args.vol_id = req.vol_id; - - /* Print information about the created device */ - err = ubi_get_vol_info1(libubi, dev_info.dev_num, args.vol_id, &vol_info); - if (err) { - sys_errmsg("cannot get information about newly created UBI volume"); - goto out_libubi; + /* + * This is hacky, but we want to wait until udev has created device + * nodes. There is probably better way do do this, though. + */ + if (system("udevsettle")) { + /* Well, this is to keep GCC silent */ } - printf("Volume ID %d, size %d LEBs (", vol_info.vol_id, vol_info.rsvd_lebs); - ubiutils_print_bytes(vol_info.rsvd_bytes, 0); - printf("), LEB size "); - ubiutils_print_bytes(vol_info.leb_size, 1); - printf(", %s, name \"%s\", alignment %d\n", - req.vol_type == UBI_DYNAMIC_VOLUME ? "dynamic" : "static", - vol_info.name, vol_info.alignment); + /* printf("Created volume %d, %lld bytes, type %s, name %s\n", + vol_id, bytes, vol_type == UBI_DYNAMIC_VOLUME ? + "dynamic" : "static", name); */ + myargs.vol_id = err; libubi_close(libubi); return 0; -- cgit v1.2.3