When the partition name already starts with "devname." skip this when adding the partition. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
125 lines
2.6 KiB
C
125 lines
2.6 KiB
C
/*
|
|
* command line partition parsing code
|
|
*
|
|
* Copyright (c) 2015 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* 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 <common.h>
|
|
#include <driver.h>
|
|
#include <fs.h>
|
|
#include <linux/err.h>
|
|
#include <cmdlinepart.h>
|
|
|
|
#define SIZE_REMAINING ((loff_t)-1)
|
|
|
|
int cmdlinepart_do_parse_one(const char *devname, const char *partstr,
|
|
const char **endp, loff_t *offset,
|
|
loff_t devsize, loff_t *retsize,
|
|
unsigned int partition_flags)
|
|
{
|
|
loff_t size;
|
|
char *end;
|
|
char buf[PATH_MAX] = {};
|
|
unsigned long flags = 0;
|
|
int ret = 0;
|
|
struct cdev *cdev;
|
|
|
|
memset(buf, 0, PATH_MAX);
|
|
|
|
if (*partstr == '-') {
|
|
size = SIZE_REMAINING;
|
|
end = (char *)partstr + 1;
|
|
} else {
|
|
size = strtoull_suffix(partstr, &end, 0);
|
|
}
|
|
|
|
if (*end == '@')
|
|
*offset = strtoull_suffix(end+1, &end, 0);
|
|
|
|
if (size == SIZE_REMAINING)
|
|
size = devsize - *offset;
|
|
|
|
partstr = end;
|
|
|
|
if (*partstr == '(') {
|
|
partstr++;
|
|
end = strchr((char *) partstr, ')');
|
|
if (!end) {
|
|
printf("could not find matching ')'\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if ((partition_flags & CMDLINEPART_ADD_DEVNAME) &&
|
|
strncmp(devname, partstr, strlen(devname)))
|
|
sprintf(buf, "%s.", devname);
|
|
memcpy(buf + strlen(buf), partstr, end - partstr);
|
|
|
|
end++;
|
|
}
|
|
|
|
if (size + *offset > devsize) {
|
|
printf("%s: partition end is beyond device\n", buf);
|
|
return -EINVAL;
|
|
}
|
|
|
|
partstr = end;
|
|
|
|
if (*partstr == 'r' && *(partstr + 1) == 'o') {
|
|
flags |= DEVFS_PARTITION_READONLY;
|
|
end = (char *)(partstr + 2);
|
|
}
|
|
|
|
if (endp)
|
|
*endp = end;
|
|
|
|
*retsize = size;
|
|
|
|
cdev = devfs_add_partition(devname, *offset, size, flags, buf);
|
|
if (IS_ERR(cdev)) {
|
|
ret = PTR_ERR(cdev);
|
|
printf("cannot create %s: %s\n", buf, strerror(-ret));
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int cmdlinepart_do_parse(const char *devname, const char *parts, loff_t devsize,
|
|
unsigned partition_flags)
|
|
{
|
|
loff_t offset = 0;
|
|
int ret;
|
|
|
|
while (1) {
|
|
loff_t size = 0;
|
|
|
|
ret = cmdlinepart_do_parse_one(devname, parts, &parts, &offset,
|
|
devsize, &size, partition_flags);
|
|
if (ret)
|
|
return ret;
|
|
|
|
offset += size;
|
|
if (!*parts)
|
|
break;
|
|
|
|
if (*parts != ',') {
|
|
printf("parse error\n");
|
|
return -EINVAL;
|
|
}
|
|
parts++;
|
|
}
|
|
|
|
return 0;
|
|
}
|