Fixed some style bugs in previous commit (mainly highly non-KNF indentation).
This commit is contained in:
parent
ba62a56380
commit
f7bf3122d9
@ -84,8 +84,9 @@ checkfilesys(const char *fname)
|
||||
return 8;
|
||||
}
|
||||
|
||||
if (checkdirty(dosfs, &boot) && !force) {
|
||||
if (preen) printf("%s: ", fname);
|
||||
if (checkdirty(dosfs, &boot) && !force) {
|
||||
if (preen)
|
||||
printf("%s: ", fname);
|
||||
printf("FILESYSTEM CLEAN; SKIPPING CHECKS\n");
|
||||
ret = 0;
|
||||
goto out;
|
||||
@ -199,18 +200,19 @@ checkfilesys(const char *fname)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int checkdirty(int fs, struct bootblock *boot)
|
||||
int
|
||||
checkdirty(int fs, struct bootblock *boot)
|
||||
{
|
||||
off_t off;
|
||||
u_char *buffer;
|
||||
int ret = 0;
|
||||
|
||||
|
||||
if (boot->ClustMask == CLUST12_MASK)
|
||||
return 0;
|
||||
return 0;
|
||||
|
||||
off = boot->ResSectors;
|
||||
off *= boot->BytesPerSec;
|
||||
|
||||
|
||||
buffer = malloc(boot->BytesPerSec);
|
||||
if (buffer == NULL) {
|
||||
perror("No space for FAT");
|
||||
@ -222,19 +224,17 @@ int checkdirty(int fs, struct bootblock *boot)
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (read(fs, buffer, boot->BytesPerSec)
|
||||
!= boot->BytesPerSec) {
|
||||
if (read(fs, buffer, boot->BytesPerSec) != boot->BytesPerSec) {
|
||||
perror("Unable to read FAT");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (buffer[0] == boot->Media && buffer[1] == 0xff
|
||||
&& buffer[2] == 0xff
|
||||
&& ((boot->ClustMask == CLUST16_MASK && buffer[3] == 0x7f)
|
||||
|| (boot->ClustMask == CLUST32_MASK
|
||||
&& buffer[3] == 0x0f && buffer[4] == 0xff
|
||||
&& buffer[5] == 0xff && buffer[6] == 0xff
|
||||
&& buffer[7] == 0x07)))
|
||||
if (buffer[0] == boot->Media && buffer[1] == 0xff &&
|
||||
buffer[2] == 0xff &&
|
||||
((boot->ClustMask == CLUST16_MASK && buffer[3] == 0x7f) ||
|
||||
(boot->ClustMask == CLUST32_MASK && buffer[3] == 0x0f &&
|
||||
buffer[4] == 0xff && buffer[5] == 0xff && buffer[6] == 0xff &&
|
||||
buffer[7] == 0x07)))
|
||||
ret = 0;
|
||||
else
|
||||
ret = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user