diff options
| author | gallatin <gallatin@FreeBSD.org> | 2001-04-07 23:48:46 +0000 |
|---|---|---|
| committer | gallatin <gallatin@FreeBSD.org> | 2001-04-07 23:48:46 +0000 |
| commit | c75e034cd698c358f17eafbbfdc7dda56f25da43 (patch) | |
| tree | dede977bc106c8a26260819efcabcff4d7efd0e0 /lib/libstand | |
| parent | cd7f922577a6598a4fe281c3f885333bd0b5f355 (diff) | |
| download | FreeBSD-src-c75e034cd698c358f17eafbbfdc7dda56f25da43.zip FreeBSD-src-c75e034cd698c358f17eafbbfdc7dda56f25da43.tar.gz | |
fix cd9660 to work on files larger than ISO_DEFAULT_BLOCK_SIZE and unbreak
cdboot on alphas (which has been broken since just after 4.0-RELEASE)
submitted by: jlemon
Diffstat (limited to 'lib/libstand')
| -rw-r--r-- | lib/libstand/cd9660.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c index 621d30d..87ef6e9 100644 --- a/lib/libstand/cd9660.c +++ b/lib/libstand/cd9660.c @@ -262,11 +262,12 @@ buf_read_file(f, buf_p, size_p) size_t *size_p; { struct file *fp = (struct file *)f->f_fsdata; - daddr_t blkno; + daddr_t blkno, blkoff; int rc = 0; size_t read; blkno = fp->f_off / ISO_DEFAULT_BLOCK_SIZE + fp->f_bno; + blkoff = fp->f_off % ISO_DEFAULT_BLOCK_SIZE; if (blkno != fp->f_buf_blkno) { if (fp->f_buf == (char *)0) @@ -283,8 +284,8 @@ buf_read_file(f, buf_p, size_p) fp->f_buf_blkno = blkno; } - *buf_p = fp->f_buf + fp->f_off; - *size_p = ISO_DEFAULT_BLOCK_SIZE - fp->f_off; + *buf_p = fp->f_buf + blkoff; + *size_p = ISO_DEFAULT_BLOCK_SIZE - blkoff; if (*size_p > fp->f_size - fp->f_off) *size_p = fp->f_size - fp->f_off; |
