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

Fix some style(9), although there's a lot more issues here.

Browse Source 
Fix some casting errors.

PR:		142384
Submitted by:	giffunip at tutopia dot com
Obtained from:	NetBSD
MFC after:	3 weeks
This commit is contained in:
Brian Somers 2010-06-20 09:40:54 +00:00
parent 3ba0e47047
commit 48790afa7b
5 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/fsck_msdosfs/Makefile
View File

@ -9,6 +9,6 @@ MAN= fsck_msdosfs.8
SRCS= main.c check.c boot.c fat.c dir.c fsutil.c
CFLAGS+= -I${FSCK}
WARNS?= 0
WARNS?= 2
.include <bsd.prog.mk>

36
sbin/fsck_msdosfs/boot.c
View File

@ -48,13 +48,14 @@ readboot(int dosfs, struct bootblock *boot)
int ret = FSOK;
int i;
if ((size_t)read(dosfs, block, sizeof block) != sizeof block) {
if (read(dosfs, block, sizeof block) != sizeof block) {
perror("could not read boot block");
return FSFATAL;
}
if (block[510] != 0x55 || block[511] != 0xaa) {
pfatal("Invalid signature in boot block: %02x%02x", block[511], block[510]);
pfatal("Invalid signature in boot block: %02x%02x",
block[511], block[510]);
return FSFATAL;
}
@ -72,8 +73,10 @@ readboot(int dosfs, struct bootblock *boot)
boot->bpbFATsmall = block[22] + (block[23] << 8);
boot->SecPerTrack = block[24] + (block[25] << 8);
boot->bpbHeads = block[26] + (block[27] << 8);
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);
boot->FATsecs = boot->bpbFATsmall;
@ -97,10 +100,9 @@ readboot(int dosfs, struct bootblock *boot)
boot->bpbFSInfo = block[48] + (block[49] << 8);
boot->bpbBackup = block[50] + (block[51] << 8);
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) {
perror("could not read fsinfo block");
return FSFATAL;
}
@ -124,7 +126,8 @@ readboot(int dosfs, struct bootblock *boot)
fsinfo[0x3fc] = fsinfo[0x3fd] = 0;
fsinfo[0x3fe] = 0x55;
fsinfo[0x3ff] = 0xaa;
if (lseek(dosfs, boot->bpbFSInfo * boot->bpbBytesPerSec, SEEK_SET)
if (lseek(dosfs, boot->bpbFSInfo *
boot->bpbBytesPerSec, SEEK_SET)
!= boot->bpbFSInfo * boot->bpbBytesPerSec
|| write(dosfs, fsinfo, sizeof fsinfo)
!= sizeof fsinfo) {
@ -144,7 +147,8 @@ readboot(int dosfs, struct bootblock *boot)
+ (fsinfo[0x1ef] << 24);
}
if (lseek(dosfs, boot->bpbBackup * boot->bpbBytesPerSec, SEEK_SET)
if (lseek(dosfs, boot->bpbBackup * boot->bpbBytesPerSec,
SEEK_SET)
!= boot->bpbBackup * boot->bpbBytesPerSec
|| read(dosfs, backup, sizeof backup) != sizeof backup) {
perror("could not read backup bootblock");
@ -172,11 +176,10 @@ readboot(int dosfs, struct bootblock *boot)
/* Check backup bpbFSInfo? XXX */
}
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;
if (boot->bpbBytesPerSec % DOSBOOTBLOCKSIZE != 0) {
pfatal("Invalid sector size: %u", boot->bpbBytesPerSec);
@ -191,7 +194,8 @@ readboot(int dosfs, struct bootblock *boot)
boot->NumSectors = boot->bpbSectors;
} else
boot->NumSectors = boot->bpbHugeSectors;
boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) / boot->bpbSecPerClust;
boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) /
boot->bpbSecPerClust;
if (boot->flags&FAT32)
boot->ClustMask = CLUST32_MASK;

2
sbin/fsck_msdosfs/check.c
View File

@ -98,7 +98,7 @@ checkfilesys(const char *fname)
}
if (boot.ValidFat < 0)
for (i = 1; i < (int)boot.bpbFATs; i++) {
for (i = 1; i < boot.bpbFATs; i++) {
struct fatEntry *currentFat;
mod |= readfat(dosfs, &boot, i, &currentFat);

15
sbin/fsck_msdosfs/dir.c
View File

@ -242,7 +242,8 @@ resetDosDirSection(struct bootblock *boot, struct fatEntry *fat)
memset(rootDir, 0, sizeof *rootDir);
if (boot->flags & FAT32) {
if (boot->bpbRootClust < CLUST_FIRST || boot->bpbRootClust >= boot->NumClusters) {
if (boot->bpbRootClust < CLUST_FIRST ||
boot->bpbRootClust >= boot->NumClusters) {
pfatal("Root directory starts with cluster out of range(%u)",
boot->bpbRootClust);
return FSFATAL;
@ -356,7 +357,8 @@ removede(int f, struct bootblock *boot, struct fatEntry *fat, u_char *start,
pwarn("Invalid long filename entry for %s\n", path);
break;
case 1:
pwarn("Invalid long filename entry at end of directory %s\n", path);
pwarn("Invalid long filename entry at end of directory %s\n",
path);
break;
case 2:
pwarn("Invalid long filename entry for volume label\n");
@ -418,7 +420,8 @@ checksize(struct bootblock *boot, struct fatEntry *fat, u_char *p,
cl_t cl;
u_int32_t sz = 0;
for (cl = dir->head; (sz += boot->ClusterSize) < dir->size;)
for (cl = dir->head; (sz += boot->ClusterSize) <
dir->size;)
cl = fat[cl].next;
clearchain(boot, fat, fat[cl].next);
fat[cl].next = CLUST_EOF;
@ -462,7 +465,8 @@ readDosDirSection(int f, struct bootblock *boot, struct fatEntry *fat,
do {
if (!(boot->flags & FAT32) && !dir->parent) {
last = boot->bpbRootDirEnts * 32;
off = boot->bpbResSectors + boot->bpbFATs * boot->FATsecs;
off = boot->bpbResSectors + boot->bpbFATs *
boot->FATsecs;
} else {
last = boot->bpbSecPerClust * boot->bpbBytesPerSec;
off = cl * boot->bpbSecPerClust + boot->ClusterOffset;
@ -547,7 +551,8 @@ readDosDirSection(int f, struct bootblock *boot, struct fatEntry *fat,
}
lidx = *p & LRNOMASK;
t = longName + --lidx * 13;
for (k = 1; k < 11 && t < longName + sizeof(longName); k += 2) {
for (k = 1; k < 11 && t < longName +
sizeof(longName); k += 2) {
if (!p[k] && !p[k + 1])
break;
*t++ = p[k];

3
sbin/fsck_msdosfs/fat.c
View File

@ -87,7 +87,8 @@ checkdirty(int fs, struct bootblock *boot)
goto err;
}
if (read(fs, buffer, boot->bpbBytesPerSec) != boot->bpbBytesPerSec) {
if ((size_t)read(fs, buffer, boot->bpbBytesPerSec) !=
boot->bpbBytesPerSec) {
perror("Unable to read FAT");
goto err;
}