51a52,53
> u_int secsz = 512;
>
223a226,236
> int
> mkimg_seek(int fd, lba_t blk)
> {
> off_t off;
>
> off = blk * secsz;
> if (lseek(fd, off, SEEK_SET) != off)
> return (errno);
> return (0);
> }
>
229,230c242,243
< off_t offset;
< uint64_t size;
---
> lba_t block;
> off_t bytesize;
248c261
< offset = scheme_first_offset(nparts);
---
> block = scheme_first_block();
250,254c263,264
< part->offset = offset;
< lseek(tmpfd, offset, SEEK_SET);
< /* XXX check error */
<
< error = 0;
---
> part->block = block;
> error = mkimg_seek(tmpfd, block);
257c267
< if (expand_number(part->contents, &size) == -1)
---
> if (expand_number(part->contents, &bytesize) == -1)
263c273
< error = fdcopy(fd, tmpfd, &size);
---
> error = fdcopy(fd, tmpfd, &bytesize);
271c281
< error = fdcopy(fileno(fp), tmpfd, &size);
---
> error = fdcopy(fileno(fp), tmpfd, &bytesize);
279,281c289,290
< size = scheme_round(size);
< part->size = size;
< offset = scheme_next_offset(offset, size);
---
> part->size = (bytesize + secsz - 1) / secsz;
> block = scheme_next_block(part->block, part->size);
284c293
< error = (scheme_write(tmpfd, offset));
---
> error = (scheme_write(tmpfd, block));