31c31
< "$FreeBSD: head/sbin/fsck_msdosfs/boot.c 203874 2010-02-14 12:31:28Z kib $";
---
> "$FreeBSD: head/sbin/fsck_msdosfs/boot.c 209364 2010-06-20 09:40:54Z brian $";
51c51
< if ((size_t)read(dosfs, block, sizeof block) != sizeof block) {
---
> if (read(dosfs, block, sizeof block) != sizeof block) {
57c57,58
< pfatal("Invalid signature in boot block: %02x%02x", block[511], block[510]);
---
> pfatal("Invalid signature in boot block: %02x%02x",
> block[511], block[510]);
75,76c76,79
< boot->bpbHiddenSecs = block[28] + (block[29] << 8) + (block[30] << 16) + (block[31] << 24);
< boot->bpbHugeSectors = block[32] + (block[33] << 8) + (block[34] << 16) + (block[35] << 24);
---
> boot->bpbHiddenSecs = block[28] + (block[29] << 8) +
> (block[30] << 16) + (block[31] << 24);
> boot->bpbHugeSectors = block[32] + (block[33] << 8) +
> (block[34] << 16) + (block[35] << 24);
100,103c103,105
< if (lseek(dosfs, boot->bpbFSInfo * boot->bpbBytesPerSec, SEEK_SET)
< != boot->bpbFSInfo * boot->bpbBytesPerSec
< || read(dosfs, fsinfo, sizeof fsinfo)
< != sizeof fsinfo) {
---
> if (lseek(dosfs, boot->bpbFSInfo * boot->bpbBytesPerSec,
> SEEK_SET) != boot->bpbFSInfo * boot->bpbBytesPerSec
> || read(dosfs, fsinfo, sizeof fsinfo) != sizeof fsinfo) {
127c129,130
< if (lseek(dosfs, boot->bpbFSInfo * boot->bpbBytesPerSec, SEEK_SET)
---
> if (lseek(dosfs, boot->bpbFSInfo *
> boot->bpbBytesPerSec, SEEK_SET)
147c150,151
< if (lseek(dosfs, boot->bpbBackup * boot->bpbBytesPerSec, SEEK_SET)
---
> if (lseek(dosfs, boot->bpbBackup * boot->bpbBytesPerSec,
> SEEK_SET)
175,179c179,182
< boot->ClusterOffset = (boot->bpbRootDirEnts * 32 + boot->bpbBytesPerSec - 1)
< / boot->bpbBytesPerSec
< + boot->bpbResSectors
< + boot->bpbFATs * boot->FATsecs
< - CLUST_FIRST * boot->bpbSecPerClust;
---
> boot->ClusterOffset = (boot->bpbRootDirEnts * 32 +
> boot->bpbBytesPerSec - 1) / boot->bpbBytesPerSec +
> boot->bpbResSectors + boot->bpbFATs * boot->FATsecs -
> CLUST_FIRST * boot->bpbSecPerClust;
194c197,198
< boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) / boot->bpbSecPerClust;
---
> boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) /
> boot->bpbSecPerClust;