sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

addpart: support @<offset> 

We claim to be compatible with the kernel's cmdlinepart parser, so
support <size>@<offset> like the kernel does.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Peter Korsgaard 2010-01-15 14:44:54 +01:00 committed by Sascha Hauer
parent 12769b3b78
commit d8a014ccdf
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
commands/partition.c
View File

@ -41,8 +41,10 @@
#include <linux/stat.h>
#include <libgen.h>
#define SIZE_REMAINING ((ulong)-1)
static int mtd_part_do_parse_one(char *devname, const char *partstr,
char **endp, unsigned long offset,
char **endp, unsigned long *offset,
off_t devsize, size_t *retsize)
{
ulong size;
@ -54,12 +56,18 @@ static int mtd_part_do_parse_one(char *devname, const char *partstr,
memset(buf, 0, PATH_MAX);
if (*partstr == '-') {
size = devsize - offset;
size = SIZE_REMAINING;
end = (char *)partstr + 1;
} else {
size = strtoul_suffix(partstr, &end, 0);
}
if (*end == '@')
*offset = strtoul_suffix(end+1, &end, 0);
if (size == SIZE_REMAINING)
size = devsize - *offset;
partstr = end;
if (*partstr == '(') {
@ -76,7 +84,7 @@ static int mtd_part_do_parse_one(char *devname, const char *partstr,
end++;
}
if (size + offset > devsize) {
if (size + *offset > devsize) {
printf("%s: partition end is beyond device\n", buf);
return -EINVAL;
}
@ -93,7 +101,7 @@ static int mtd_part_do_parse_one(char *devname, const char *partstr,
*retsize = size;
ret = devfs_add_partition(devname, offset, size, flags, buf);
ret = devfs_add_partition(devname, *offset, size, flags, buf);
if (ret)
printf("cannot create %s: %s\n", buf, strerror(-ret));
return ret;
@ -123,7 +131,7 @@ static int do_addpart(cmd_tbl_t * cmdtp, int argc, char *argv[])
while (1) {
size_t size = 0;
if (mtd_part_do_parse_one(devname, endp, &endp, offset, devsize, &size))
if (mtd_part_do_parse_one(devname, endp, &endp, &offset, devsize, &size))
return 1;
offset += size;
@ -146,10 +154,11 @@ static const __maybe_unused char cmd_addpart_help[] =
"\n"
"addpart adds a partition description to a device. The partition description\n"
"has the form\n"
"size1(name1)[ro],size2(name2)[ro],...\n"
"<device> is the device name under. Size can be given in decimal or if prefixed\n"
"with 0x in hex. Sizes can have an optional suffix K,M,G. The size of the last\n"
"partition can be specified as '-' for the remaining space of the device.\n"
"size1[@offset1](name1)[ro],size2[@offset2](name2)[ro],...\n"
"<device> is the device name under. Size and offset can be given in decimal\n"
"or - if prefixed with 0x in hex. Both can have an optional suffix K,M,G.\n"
"The size of the last partition can be specified as '-' for the remaining\n"
"space of the device.\n"
"This format is the same as used in the Linux kernel for cmdline mtd partitions.\n"
"\n"
"Note: That this command has to be reworked and will probably change it's API.";
@ -167,12 +176,12 @@ BAREBOX_CMD_END
* Adds a partition description to a device. The partition description has the
* form
*
* size1(name1)[ro],size2(name2)[ro],...
* size1[@offset1](name1)[ro],size2[@offset2](name2)[ro],...
*
* \<device> is the device name under. Sizes can be given in decimal or - if
* prefixed with 0x - in hex. Sizes can have an optional suffix K,M,G. The
* size of the last partition can be specified as '-' for the remaining space
* of the device.
* \<device> is the device name under. Size and offset can be given in decimal
* or - if prefixed with 0x - in hex. Both can have an optional suffix K,M,G.
* The size of the last partition can be specified as '-' for the remaining
* space of the device.
*
* @note The format is the same as used in the Linux kernel for cmdline mtd
* partitions.