leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-ubi

Browse Source
This commit is contained in:
Tom Rini 2017-09-15 08:45:21 -04:00
commit 1c7b5d0309
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/ubi.c
View File

@ -334,6 +334,7 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
unsigned long long tmp; unsigned long long tmp;
struct ubi_volume *vol; struct ubi_volume *vol;
loff_t offp = 0; loff_t offp = 0;
size_t len_read;
vol = ubi_find_volume(volume); vol = ubi_find_volume(volume);
if (vol == NULL) if (vol == NULL)
@ -373,6 +374,7 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
tmp = offp; tmp = offp;
off = do_div(tmp, vol->usable_leb_size); off = do_div(tmp, vol->usable_leb_size);
lnum = tmp; lnum = tmp;
len_read = size;
do { do {
if (off + len >= vol->usable_leb_size) if (off + len >= vol->usable_leb_size)
len = vol->usable_leb_size - off; len = vol->usable_leb_size - off;
@ -398,6 +400,9 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
len = size > tbuf_size ? tbuf_size : size; len = size > tbuf_size ? tbuf_size : size;
} while (size); } while (size);
if (!size)
env_set_hex("filesize", len_read);
free(tbuf); free(tbuf);
return err; return err;
} }