summaryrefslogtreecommitdiffstats
path: root/common/ubiformat.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-01-29 20:47:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-02-09 10:08:58 +0100
commit6f3ff5e61c3ff92356345604415dd682b817bf76 (patch)
treeada1080770116bf729c2e8c12c3e0ee70ebe5429 /common/ubiformat.c
parent359966df3721803a1e0873c98182e7280029b068 (diff)
downloadbarebox-6f3ff5e61c3ff92356345604415dd682b817bf76.tar.gz
ubiformat: Allow to ubiformat with a buffer given
So far ubiformat can only handle files. Make it possible to pass a buffer into ubiformat. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/ubiformat.c')
-rw-r--r--common/ubiformat.c55
1 files changed, 36 insertions, 19 deletions
diff --git a/common/ubiformat.c b/common/ubiformat.c
index f728119..9fe1c7c 100644
--- a/common/ubiformat.c
+++ b/common/ubiformat.c
@@ -187,16 +187,22 @@ static int mark_bad(struct ubiformat_args *args, struct mtd_info *mtd,
static int flash_image(struct ubiformat_args *args, struct mtd_info *mtd,
const struct ubigen_info *ui, struct ubi_scan_info *si)
{
- int fd, img_ebs, eb, written_ebs = 0, ret = -1, eb_cnt;
+ int fd = 0, img_ebs, eb, written_ebs = 0, ret = -1, eb_cnt;
off_t st_size;
char *buf = NULL;
uint64_t lastprint = 0;
+ const void *inbuf = NULL;
eb_cnt = mtd_num_pebs(mtd);
- fd = open_file(args->image, &st_size);
- if (fd < 0)
- return fd;
+ if (args->image) {
+ fd = open_file(args->image, &st_size);
+ if (fd < 0)
+ return fd;
+ } else {
+ inbuf = args->image_buf;
+ st_size = args->image_size;
+ }
buf = malloc(mtd->erasesize);
if (!buf) {
@@ -207,20 +213,20 @@ static int flash_image(struct ubiformat_args *args, struct mtd_info *mtd,
img_ebs = st_size / mtd->erasesize;
if (img_ebs > si->good_cnt) {
- sys_errmsg("file \"%s\" is too large (%lld bytes)",
- args->image, (long long)st_size);
+ sys_errmsg("image is too large (%lld bytes)",
+ (long long)st_size);
goto out_close;
}
if (st_size % mtd->erasesize) {
- sys_errmsg("file \"%s\" (size %lld bytes) is not multiple of "
+ sys_errmsg("image (size %lld bytes) is not multiple of "
"eraseblock size (%d bytes)",
- args->image, (long long)st_size, mtd->erasesize);
+ (long long)st_size, mtd->erasesize);
goto out_close;
}
if (st_size == 0) {
- sys_errmsg("file \"%s\" has size 0 bytes", args->image);
+ sys_errmsg("image has size 0 bytes");
goto out_close;
}
@@ -260,11 +266,16 @@ static int flash_image(struct ubiformat_args *args, struct mtd_info *mtd,
continue;
}
- err = read_full(fd, buf, mtd->erasesize);
- if (err < 0) {
- sys_errmsg("failed to read eraseblock %d from \"%s\"",
- written_ebs, args->image);
- goto out_close;
+ if (args->image) {
+ err = read_full(fd, buf, mtd->erasesize);
+ if (err < 0) {
+ sys_errmsg("failed to read eraseblock %d from image",
+ written_ebs);
+ goto out_close;
+ }
+ } else {
+ memcpy(buf, inbuf, mtd->erasesize);
+ inbuf += mtd->erasesize;
}
if (args->override_ec)
@@ -280,8 +291,8 @@ static int flash_image(struct ubiformat_args *args, struct mtd_info *mtd,
err = change_ech((struct ubi_ec_hdr *)buf, ui->image_seq, ec);
if (err) {
- errmsg("bad EC header at eraseblock %d of \"%s\"",
- written_ebs, args->image);
+ errmsg("bad EC header at eraseblock %d of image",
+ written_ebs);
goto out_close;
}
@@ -317,7 +328,8 @@ static int flash_image(struct ubiformat_args *args, struct mtd_info *mtd,
out_close:
free(buf);
- close(fd);
+ if (args->image)
+ close(fd);
return ret;
}
@@ -454,6 +466,11 @@ out_free:
return -1;
}
+static bool ubiformat_has_image(struct ubiformat_args *args)
+{
+ return args->image || args->image_buf;
+}
+
int ubiformat(struct mtd_info *mtd, struct ubiformat_args *args)
{
int err, verbose, eb_cnt;
@@ -555,7 +572,7 @@ int ubiformat(struct mtd_info *mtd, struct ubiformat_args *args)
goto out_free;
}
- if (si->good_cnt < 2 && (!args->novtbl || args->image)) {
+ if (si->good_cnt < 2 && (!args->novtbl || ubiformat_has_image(args))) {
errmsg("too few non-bad eraseblocks (%d) on %s",
si->good_cnt, mtd->name);
err = -EINVAL;
@@ -654,7 +671,7 @@ int ubiformat(struct mtd_info *mtd, struct ubiformat_args *args)
}
}
- if (args->image) {
+ if (ubiformat_has_image(args)) {
err = flash_image(args, mtd, &ui, si);
if (err < 0)
goto out_free;