[PATCH] Added -m option to ubimkvol

[Zoltan Sogor]

From: Zoltan Sogor <weth at inf.u-szeged.hu>

Creates the volume with maximum available size

Signed-off-by: Zoltan Sogor <weth at inf.u-szeged.hu>
---
  ubi-utils/src/ubimkvol.c |   35 ++++++++++++++++++++++++++++++-----
  1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ubi-utils/src/ubimkvol.c b/ubi-utils/src/ubimkvol.c
index 1368671..db57a93 100644
--- a/ubi-utils/src/ubimkvol.c
+++ b/ubi-utils/src/ubimkvol.c
@@ -55,6 +55,7 @@ struct args {
  	char *name;
  	int nlen;
  	char node[256];
+	int maxavs;

  	/* special stuff needed to get additional arguments */
  	char *arg1;
@@ -69,6 +70,7 @@ static struct args myargs = {
  	.vol_id = UBI_VOL_NUM_AUTO,
  	.name = NULL,
  	.nlen = 0,
+	.maxavs = 0,
  };

  static int param_sanity_check(struct args *args, libubi_t libubi);
@@ -85,6 +87,7 @@ static const char *optionsstr =
  "  -N, --name=<name>          volume name\n"
  "  -s, --size=<bytes>         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=<static|dynamic>   volume type (dynamic, static), 
default is\n"
  "                             dynamic\n"
  "  -?, --help                 Give this help list\n"
@@ -93,10 +96,10 @@ static const char *optionsstr =

  static const char *usage =
  "Usage: ubimkvol [-?V] [-a <alignment>] [-d <devn>] [-n <volume id>]\n"
-"            [-N <name>] [-s <bytes>] [-t <static|dynamic>]\n"
+"            [-N <name>] [-s <bytes>] [-t <static|dynamic>] [-m]\n"
  "            [--alignment=<alignment>] [--devn=<devn>] 
[--vol_id=<volume id>]\n"
  "            [--name=<name>] [--size=<bytes>] 
[--type=<static|dynamic>] [--help]\n"
-"            [--usage] [--version]\n";
+"            [--usage] [--version] [--maxavsize]\n";

  struct option long_options[] = {
  	{ .name = "alignment", .has_arg = 1, .flag = NULL, .val = 'a' },
@@ -108,6 +111,7 @@ struct option long_options[] = {
  	{ .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}
  };

@@ -129,7 +133,7 @@ parse_opt(int argc, char **argv, struct args *args)
  	while (1) {
  		int key;

-		key = getopt_long(argc, argv, "a:d:n:N:s:t:?V", long_options, NULL);
+		key = getopt_long(argc, argv, "a:d:n:N:s:t:?Vm", long_options, NULL);
  		if (key == -1)
  			break;

@@ -216,6 +220,10 @@ parse_opt(int argc, char **argv, struct args *args)
  				exit(0);
  				break;

+			case 'm':
+				args->maxavs = 1;
+				break;
+
  			default:
  				fprintf(stderr, "%s", usage);
  				exit(-1);
@@ -232,7 +240,7 @@ static int param_sanity_check(struct args *args, 
libubi_t libubi)
  	int err, len;
  	struct ubi_info ubi;

-	if (args->bytes == 0) {
+	if (args->bytes == 0 && !args->maxavs) {
  		fprintf(stderr, "Volume size was not specified\n");
  		goto out;
  	}
@@ -297,7 +305,24 @@ int main(int argc, char * const argv[])

  	req.vol_id = myargs.vol_id;
  	req.alignment = myargs.alignment;
-	req.bytes = myargs.bytes;
+
+	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_type = myargs.vol_type;
  	req.name = myargs.name;

-- 
1.4.4.4