d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update local variable 'block' after calling capacity_resize(),

Browse Source 
otherwise format_resize(), which is called right after, isn't
getting the current/actual image size. Rather than rounding up,
format_resize() could end up truncating the size and we don't
allow that by design.

MFC after:	1 week
This commit is contained in:
Marcel Moolenaar 2016-09-24 17:29:27 +00:00
parent 2b4da8aa20
commit ac3425511d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=306299
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/mkimg/mkimg.c
View File

@ -463,13 +463,16 @@ mkimg(void)
block = scheme_metadata(SCHEME_META_IMG_END, block);
error = image_set_size(block);
if (!error)
if (!error) {
error = capacity_resize(block);
if (!error)
block = image_get_size();
}
if (!error) {
error = format_resize(block);
block = image_get_size();
}
if (error)
errc(EX_IOERR, error, "image sizing");
block = image_get_size();
ncyls = block / (nsecs * nheads);
error = scheme_write(block);
if (error)